* linux-next: "spi/devicetree: Move devicetree support code into spi directory" commit
From: Paul Gortmaker @ 2012-04-13 14:56 UTC (permalink / raw)
To: grant.likely; +Cc: rob.herring, linux-next
Hi Grant,
Can you take a look at this failure?
drivers/spi/spi-fsl-lib.h:56:33: warning: 'struct spi_message' declared inside parameter list
drivers/spi/spi-fsl-lib.h:56:33: warning: its scope is only this definition or declaration, which is probably not what you want
drivers/spi/spi-fsl-lib.h:115:64: warning: 'struct spi_message' declared inside parameter list
drivers/spi/spi-fsl-lib.c: In function 'mpc8xxx_spi_work':
drivers/spi/spi-fsl-lib.c:68:27: error: dereferencing pointer to incomplete type
Bisect leads me to:
------------
6810d770847c0f24555c13dd80b64fcc30c47ad8 is the first bad commit
commit 6810d770847c0f24555c13dd80b64fcc30c47ad8
Author: Grant Likely <grant.likely@secretlab.ca>
Date: Sat Apr 7 14:16:53 2012 -0600
spi/devicetree: Move devicetree support code into spi directory
------------
Failure is in mpc85xx_defconfig.
http://kisskb.ellerman.id.au/kisskb/buildresult/6100610/
Thanks,
Paul.
^ permalink raw reply
* Re: linux-next: "spi/devicetree: Move devicetree support code into spi directory" commit
From: Grant Likely @ 2012-04-13 16:23 UTC (permalink / raw)
To: Paul Gortmaker; +Cc: rob.herring, linux-next
In-Reply-To: <20120413145623.GA3898@windriver.com>
On Fri, 13 Apr 2012 10:56:23 -0400, Paul Gortmaker <paul.gortmaker@windriver.com> wrote:
> Hi Grant,
>
> Can you take a look at this failure?
Hi Paul,
Thanks for telling me about this. It's fixed in my tree now.
g.
>
> drivers/spi/spi-fsl-lib.h:56:33: warning: 'struct spi_message' declared inside parameter list
> drivers/spi/spi-fsl-lib.h:56:33: warning: its scope is only this definition or declaration, which is probably not what you want
> drivers/spi/spi-fsl-lib.h:115:64: warning: 'struct spi_message' declared inside parameter list
> drivers/spi/spi-fsl-lib.c: In function 'mpc8xxx_spi_work':
> drivers/spi/spi-fsl-lib.c:68:27: error: dereferencing pointer to incomplete type
>
> Bisect leads me to:
>
> ------------
> 6810d770847c0f24555c13dd80b64fcc30c47ad8 is the first bad commit
> commit 6810d770847c0f24555c13dd80b64fcc30c47ad8
> Author: Grant Likely <grant.likely@secretlab.ca>
> Date: Sat Apr 7 14:16:53 2012 -0600
>
> spi/devicetree: Move devicetree support code into spi directory
> ------------
>
> Failure is in mpc85xx_defconfig.
>
> http://kisskb.ellerman.id.au/kisskb/buildresult/6100610/
>
> Thanks,
> Paul.
>
>
--
Grant Likely, B.Sc, P.Eng.
Secret Lab Technologies,Ltd.
^ permalink raw reply
* Re: [PATCH] mm: extend prefault helpers to fault in more than PAGE_SIZE
From: Geert Uytterhoeven @ 2012-04-13 19:12 UTC (permalink / raw)
To: Daniel Vetter
Cc: Andrew Morton, Intel Graphics Development, DRI Development, LKML,
Linux MM, Linux-Next
In-Reply-To: <1330629779-1449-1-git-send-email-daniel.vetter@ffwll.ch>
On Thu, Mar 1, 2012 at 20:22, Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
> +/* Multipage variants of the above prefault helpers, useful if more than
> + * PAGE_SIZE of date needs to be prefaulted. These are separate from the above
> + * functions (which only handle up to PAGE_SIZE) to avoid clobbering the
> + * filemap.c hotpaths. */
> +static inline int fault_in_multipages_writeable(char __user *uaddr, int size)
> +{
> + int ret;
> + const char __user *end = uaddr + size - 1;
Please drop the const.
> +
> + if (unlikely(size == 0))
> + return 0;
> +
> + /*
> + * Writing zeroes into userspace here is OK, because we know that if
> + * the zero gets there, we'll be overwriting it.
> + */
> + while (uaddr <= end) {
> + ret = __put_user(0, uaddr);
> + if (ret != 0)
> + return ret;
> + uaddr += PAGE_SIZE;
> + }
> +
> + /* Check whether the range spilled into the next page. */
> + if (((unsigned long)uaddr & PAGE_MASK) ==
> + ((unsigned long)end & PAGE_MASK))
> + ret = __put_user(0, end);
include/linux/pagemap.h:483:3: error: read-only location '*end' used
as 'asm' output
Now in -next:
http://kisskb.ellerman.id.au/kisskb/buildresult/6100650/
http://kisskb.ellerman.id.au/kisskb/buildresult/6100673/
http://kisskb.ellerman.id.au/kisskb/buildresult/6100860/
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
^ permalink raw reply
* linux-next: triage for April 15, 2012
From: Paul Gortmaker @ 2012-04-15 22:30 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel, daniel.vetter
This represents the state of the builds as of Friday, as there
are no builds over the weekend.
All new breakage is in pagemap.h ; it seems a fix has been
posted already.
http://marc.info/?l=linux-kernel&m=133441945530527&w=2
----------------------
New breakage since last report:
avr32:defconfig
(pagemap.h:483: error: assignment of read-only variable '__pu_val')
m68k:defconfig,sun3_defconfig
(pagemap.h:483:3: error: read-only location '*end' used as 'asm' output)
mips:(all builds)
(pagemap.h:483:3: error: assignment of read-only variable '__pu_val')
Randconfig fails that may or may not be new (by their very nature):
<none>
Builds that are fixed since last report:
sparc[64]:allmodconfig
Note: The randconfig fails are only listed once and not tracked
in the below listing.
I'm also not tracking the kallsyms extra pass stuff on ARM on
a per board basis anymore. It has nothing to do with the board.
Why? See: http://marc.info/?l=linux-next&m=133267456809502
------------------------------------------------
Latest results at:
http://kisskb.ellerman.id.au/kisskb/branch/9/
Failures as of April 15th, 2012:
===============================
AM33:asb2303_defconfig,asb2364_defconfig
when: Mar 15
why: cc1: error: unrecognized command line option '-mmem-funcs'
status: Possible fix from TonyB sent for review.
fix: http://marc.info/?l=linux-kernel&m=133185020313818&w=2
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/5878400/
----------------
ARM:u8500_defconfig
when: Apr 11
why: ste_dma40.c: implicit declaration of function 'regulator_disable'
status: reported
fix:
ref: http://marc.info/?l=linux-next&m=133428028418892&w=2
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6091624/
ARM:netx_defconfig,pnx4008_defconfig
when: Mar 14
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/
ref: https://lkml.org/lkml/2012/3/13/670
ARM:ixp4xx_defconfig
when: Oct 26
why: gpio.h: implicit declaration of function '__gpio_get_value'
status: fixed (Imre Kaloz) - but possibly needs rework?
fix: https://lkml.org/lkml/2012/2/8/288
ref: https://lkml.org/lkml/2012/2/8/287
ARM:raumfeld_defconfig
when: Nov 23
why: eeti_ts.c: implicit declaration of function 'irq_to_gpio'
status: perhaps broken since 2010? See ref below.
fix:
ref: http://www.gossamer-threads.com/lists/linux/kernel/1291618?do=post_view_threaded#1291618
ARM:arm-allnoconfig
when: forever
why: not supported
status: nothing pending, but patches accepted
fix: n/a
ref: https://lkml.org/lkml/2009/4/30/105
ref: http://lists.infradead.org/pipermail/linux-arm-kernel/2012-January/081218.html
----------------
AVR32:defconfig
when: Apr 13
why: pagemap.h:483: error: assignment of read-only variable '__pu_val'
status:
fix:
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6100592/
AVR32:allnoconfig
when: May 26 2010, 20:49
why: at32_map_usart: undefined reference to `atmel_default_console_device'
status:
fix:
ref:
---------------
bfin: 50% of builds
when: Mar 31
why: "Error: pcrel too far BFD_RELOC_BFIN_10" from kernel/time/timekeeping.c
status: unknown, binutils issue?
fix:
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6087324/
---------------
cris:allyesconfig,allmodconfig
when: Apr 3
why: too many to list here
status:
fix:
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6035250/
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6035249/
----------------
frv:defconfig
when: Mar 15
why: undefined reference to `pci_cardbus_resource_alignment'
status:
fix:
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6030067/
----------------
i386:allmodconfig
when: Apr 11
why: "rc5t583_ext_power_req_config" [drivers/regulator/rc5t583-regulator.ko] undefined!
why: "__udivdi3" [drivers/net/ethernet/mellanox/mlx4/mlx4_en.ko] undefined!
status:
fix:
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/6091475/
----------------
h8300:defconfig
when: Mar 15
why: time.c: implicit declaration of function 'get_irq_regs'
why: also seems gcc suffers an ICE
status: ICE bug lodged with gcc folks (TonyB)
fix:
ref: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=52598
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/5884668/
----------------
m32r:m32700ut.smp_defconfig
when: Mar 15
why: No rule to make target `arch/m32r/boot/compressed/vmlinux.bin
status:
fix:
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/5884670/
----------------
m68k:allmodconfig
when: Mar 16
why: persistent_ram.c: implicit declaration of 'memblock_reserve'
status:
fix:
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/5884324/
ref: http://www.spinics.net/lists/linux-next/msg19343.html
----------------
mips:allmodconfig
when:
why: driver_pci_host.c: implicit declaration of function 'pcibios_enable_device'
status: one of many fixes mips needs...
fix: http://marc.info/?l=linux-wireless&m=133272031621916&w=2
ref: http://patchwork.ozlabs.org/patch/148614/
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/5807000/
----------------
parisc:allmodconfig
when:
why: include/linux/log2.h: implicit declaration of function 'fls'
status: reported by PaulG, WIP by David Howells
fix:
ref: https://lkml.org/lkml/2012/2/29/409
ref: https://lkml.org/lkml/2012/3/6/228
parisc64:a500_defconfig
when:
why: include/linux/log2.h: implicit declaration of function 'fls'
status: reported by PaulG, WIP by David Howells
fix:
ref: https://lkml.org/lkml/2012/2/29/409
ref: https://lkml.org/lkml/2012/3/6/228
------------------
powerpc:mpc85xx_defconfig
when: Apr 12
why: spi-fsl-lib.c: dereferencing pointer to incomplete type
status: bisected and reported, fix apparently in Grant's tree.
fix:
ref: http://marc.info/?l=linux-next&m=133433429605483&w=2
powerpc:allyesconfig
when: May 18 2009, 22:11
why: fat ass kernel with everything simply won't link
status: need to fix build config to ignore the final link
fix:
ref: http://kisskb.ellerman.id.au/kisskb/buildresult/5806793/
------------------
um:um-defconfig
when: Sep 16 2010, 01:28
why: os-Linux/start_up.c: error: 'PTRACE_SETOPTIONS' undeclared
status: clearly broken forever, so does anyone care?
fix:
ref: http://kisskb.ellerman.id.au/kisskb/target/2979/
^ permalink raw reply
* Re: linux-next: triage for April 15, 2012
From: Stephen Rothwell @ 2012-04-15 23:58 UTC (permalink / raw)
To: Paul Gortmaker; +Cc: linux-next, linux-kernel, daniel.vetter
In-Reply-To: <20120415223049.GA17089@windriver.com>
[-- Attachment #1: Type: text/plain, Size: 810 bytes --]
Hi Paul,
On Sun, 15 Apr 2012 18:30:49 -0400 Paul Gortmaker <paul.gortmaker@windriver.com> wrote:
>
> All new breakage is in pagemap.h ; it seems a fix has been
> posted already.
>
> http://marc.info/?l=linux-kernel&m=133441945530527&w=2
And that patch has been added to the drm tree and so will be in today's
linux-next.
> powerpc:allyesconfig
> when: May 18 2009, 22:11
> why: fat ass kernel with everything simply won't link
> status: need to fix build config to ignore the final link
> fix:
> ref: http://kisskb.ellerman.id.au/kisskb/buildresult/5806793/
This is well known, so is probably not worth reporting any more. I am
having a (slow) look at fixing it properly, but that is a long term goal.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next: triage for April 15, 2012
From: Paul Gortmaker @ 2012-04-16 1:25 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, daniel.vetter
In-Reply-To: <20120416095829.b9b1c9fcede7bc0c86a999f4@canb.auug.org.au>
[Re: linux-next: triage for April 15, 2012] On 16/04/2012 (Mon 09:58) Stephen Rothwell wrote:
> Hi Paul,
>
> On Sun, 15 Apr 2012 18:30:49 -0400 Paul Gortmaker <paul.gortmaker@windriver.com> wrote:
> >
> > All new breakage is in pagemap.h ; it seems a fix has been
> > posted already.
> >
> > http://marc.info/?l=linux-kernel&m=133441945530527&w=2
>
> And that patch has been added to the drm tree and so will be in today's
> linux-next.
>
> > powerpc:allyesconfig
> > when: May 18 2009, 22:11
> > why: fat ass kernel with everything simply won't link
> > status: need to fix build config to ignore the final link
> > fix:
> > ref: http://kisskb.ellerman.id.au/kisskb/buildresult/5806793/
>
> This is well known, so is probably not worth reporting any more. I am
> having a (slow) look at fixing it properly, but that is a long term goal.
True. Maybe I should shove all failures that are >6mo old off the pier.
Paul.
>
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
^ permalink raw reply
* linux-next: manual merge of the wireless-next tree with the net-next tree
From: Stephen Rothwell @ 2012-04-16 2:48 UTC (permalink / raw)
To: John W. Linville
Cc: linux-next, linux-kernel, David Miller, netdev, Johannes Berg,
Wey-Yi Guy
[-- Attachment #1: Type: text/plain, Size: 1358 bytes --]
Hi John,
Today's linux-next merge of the wireless-next tree got a conflict in
drivers/net/wireless/iwlwifi/iwl-testmode.c between commit d33e152e1edd
("iwlwifi: Stop using NLA_PUT*()") from the net-next tree and commit
11483b5c2296 ("iwlwifi: move eeprom into priv") from the wireless-next
tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/net/wireless/iwlwifi/iwl-testmode.c
index f31a062,c8e89ca..0000000
--- a/drivers/net/wireless/iwlwifi/iwl-testmode.c
+++ b/drivers/net/wireless/iwlwifi/iwl-testmode.c
@@@ -543,12 -539,11 +543,12 @@@ static int iwl_testmode_driver(struct i
IWL_ERR(priv, "Memory allocation fail\n");
return -ENOMEM;
}
- NLA_PUT_U32(skb, IWL_TM_ATTR_COMMAND,
- IWL_TM_CMD_DEV2APP_EEPROM_RSP);
- NLA_PUT(skb, IWL_TM_ATTR_EEPROM,
- cfg(priv)->base_params->eeprom_size,
- priv->eeprom);
+ if (nla_put_u32(skb, IWL_TM_ATTR_COMMAND,
+ IWL_TM_CMD_DEV2APP_EEPROM_RSP) ||
+ nla_put(skb, IWL_TM_ATTR_EEPROM,
+ cfg(priv)->base_params->eeprom_size,
- priv->shrd->eeprom))
++ priv->eeprom))
+ goto nla_put_failure;
status = cfg80211_testmode_reply(skb);
if (status < 0)
IWL_ERR(priv, "Error sending msg : %d\n",
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: manual merge of the wireless-next tree with the net-next tree
From: Stephen Rothwell @ 2012-04-16 2:49 UTC (permalink / raw)
To: John W. Linville
Cc: linux-next, linux-kernel, David Miller, netdev, Pontus Fuchs
[-- Attachment #1: Type: text/plain, Size: 1483 bytes --]
Hi John,
Today's linux-next merge of the wireless-next tree got a conflict in
net/wireless/nl80211.c between commit 9360ffd18597 ("wireless: Stop using
NLA_PUT*()") from the net-next tree and commit d91df0e3a1b9 ("cfg80211:
Add channel information to NL80211_CMD_GET_INTERFACE") from the
wireless-next tree.
I applied this merge fix patch:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 16 Apr 2012 12:45:25 +1000
Subject: [PATCH] cfg80211: fix up for NLA_PUT_ api changes
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
net/wireless/nl80211.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index b33a852..acae9d4 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -1546,10 +1546,11 @@ static int nl80211_send_iface(struct sk_buff *msg, u32 pid, u32 seq, int flags,
chan = rdev->ops->get_channel(&rdev->wiphy, &channel_type);
if (chan) {
- NLA_PUT_U32(msg, NL80211_ATTR_WIPHY_FREQ,
- chan->center_freq);
- NLA_PUT_U32(msg, NL80211_ATTR_WIPHY_CHANNEL_TYPE,
- channel_type);
+ if (nla_put_u32(msg, NL80211_ATTR_WIPHY_FREQ,
+ chan->center_freq) ||
+ nla_put_u32(msg, NL80211_ATTR_WIPHY_CHANNEL_TYPE,
+ channel_type))
+ goto nla_put_failure;
}
}
--
1.7.10.rc3
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply related
* linux-next: manual merge of the wireless-next tree with the net-next tree
From: Stephen Rothwell @ 2012-04-16 2:49 UTC (permalink / raw)
To: John W. Linville
Cc: linux-next, linux-kernel, David Miller, netdev, Eric Dumazet,
Samuel Ortiz, Eric Lapuyade
[-- Attachment #1: Type: text/plain, Size: 895 bytes --]
Hi John,
Today's linux-next merge of the wireless-next tree got a conflict in
include/net/nfc/nfc.h between commit 95c961747284 ("net: cleanup unsigned
to unsigned int") from the net-next tree and commits c4fbb6515a4d ("NFC:
The core part should generate the target index") and 01ae0eea9bed ("NFC:
Fix next target_idx type and rename for clarity") from the wireless-next
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/net/nfc/nfc.h
index 79955a2,313d00f..0000000
--- a/include/net/nfc/nfc.h
+++ b/include/net/nfc/nfc.h
@@@ -86,7 -90,8 +90,8 @@@ struct nfc_genl_data
};
struct nfc_dev {
- unsigned idx;
+ unsigned int idx;
+ u32 target_next_idx;
struct nfc_target *targets;
int n_targets;
int targets_generation;
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: manual merge of the security tree with the net-next tree
From: Stephen Rothwell @ 2012-04-16 3:29 UTC (permalink / raw)
To: James Morris
Cc: linux-next, linux-kernel, David Miller, netdev, Jiri Pirko,
Will Drewry
[-- Attachment #1: Type: text/plain, Size: 757 bytes --]
Hi James,
Today's linux-next merge of the security tree got a conflict in
include/linux/filter.h between commit ffe06c17afbb ("filter: add XOR
operation") from the net-next tree and commit 46b325c7eb01
("sk_run_filter: add BPF_S_ANC_SECCOMP_LD_W") from the security tree.
Just context changes. I fixed it up (see below) and can carry the fax as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc include/linux/filter.h
index 7209099,f2e5315..0000000
--- a/include/linux/filter.h
+++ b/include/linux/filter.h
@@@ -232,7 -239,7 +243,8 @@@ enum
BPF_S_ANC_HATYPE,
BPF_S_ANC_RXHASH,
BPF_S_ANC_CPU,
+ BPF_S_ANC_ALU_XOR_X,
+ BPF_S_ANC_SECCOMP_LD_W,
};
#endif /* __KERNEL__ */
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* [PATCH] mfd: fix modular builds of rc5t583 regulator support
From: Paul Gortmaker @ 2012-04-16 4:08 UTC (permalink / raw)
To: ldewangan; +Cc: sameo, broonie, linux-kernel, linux-next, Paul Gortmaker
The combination of commit 1b1247dd75aa5cf5fae54a3bec7280046e9c7957
"mfd: Add support for RICOH PMIC RC5T583"
and commit 6ffc3270210efa2bea526953a142ffc908f5bd86
"regulator: Add support for RICOH PMIC RC5T583 regulator"
are causing the i386 allmodconfig builds to fail with this:
ERROR: "rc5t583_update" [drivers/regulator/rc5t583-regulator.ko] undefined!
ERROR: "rc5t583_set_bits" [drivers/regulator/rc5t583-regulator.ko] undefined!
ERROR: "rc5t583_clear_bits" [drivers/regulator/rc5t583-regulator.ko] undefined!
ERROR: "rc5t583_read" [drivers/regulator/rc5t583-regulator.ko] undefined!
and this:
ERROR: "rc5t583_ext_power_req_config" [drivers/regulator/rc5t583-regulator.ko] undefined!
For the 1st four, make the simple ops static inline, instead of
polluting the namespace with trivial exports. For the last one,
add an EXPORT_SYMBOL.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
[ alternately, make REGULATOR_RC5T583 bool instead of tristate? ]
diff --git a/drivers/mfd/rc5t583.c b/drivers/mfd/rc5t583.c
index 99ef944..44afae0 100644
--- a/drivers/mfd/rc5t583.c
+++ b/drivers/mfd/rc5t583.c
@@ -80,44 +80,6 @@ static struct mfd_cell rc5t583_subdevs[] = {
{.name = "rc5t583-key", }
};
-int rc5t583_write(struct device *dev, uint8_t reg, uint8_t val)
-{
- struct rc5t583 *rc5t583 = dev_get_drvdata(dev);
- return regmap_write(rc5t583->regmap, reg, val);
-}
-
-int rc5t583_read(struct device *dev, uint8_t reg, uint8_t *val)
-{
- struct rc5t583 *rc5t583 = dev_get_drvdata(dev);
- unsigned int ival;
- int ret;
- ret = regmap_read(rc5t583->regmap, reg, &ival);
- if (!ret)
- *val = (uint8_t)ival;
- return ret;
-}
-
-int rc5t583_set_bits(struct device *dev, unsigned int reg,
- unsigned int bit_mask)
-{
- struct rc5t583 *rc5t583 = dev_get_drvdata(dev);
- return regmap_update_bits(rc5t583->regmap, reg, bit_mask, bit_mask);
-}
-
-int rc5t583_clear_bits(struct device *dev, unsigned int reg,
- unsigned int bit_mask)
-{
- struct rc5t583 *rc5t583 = dev_get_drvdata(dev);
- return regmap_update_bits(rc5t583->regmap, reg, bit_mask, 0);
-}
-
-int rc5t583_update(struct device *dev, unsigned int reg,
- unsigned int val, unsigned int mask)
-{
- struct rc5t583 *rc5t583 = dev_get_drvdata(dev);
- return regmap_update_bits(rc5t583->regmap, reg, mask, val);
-}
-
static int __rc5t583_set_ext_pwrreq1_control(struct device *dev,
int id, int ext_pwr, int slots)
{
@@ -197,6 +159,7 @@ int rc5t583_ext_power_req_config(struct device *dev, int ds_id,
ds_id, ext_pwr_req);
return 0;
}
+EXPORT_SYMBOL(rc5t583_ext_power_req_config);
static int rc5t583_clear_ext_power_req(struct rc5t583 *rc5t583,
struct rc5t583_platform_data *pdata)
diff --git a/include/linux/mfd/rc5t583.h b/include/linux/mfd/rc5t583.h
index b2c1f44..c42fe92 100644
--- a/include/linux/mfd/rc5t583.h
+++ b/include/linux/mfd/rc5t583.h
@@ -26,6 +26,7 @@
#include <linux/mutex.h>
#include <linux/types.h>
+#include <linux/regmap.h>
#define RC5T583_MAX_REGS 0xF8
@@ -308,14 +309,44 @@ struct rc5t583_platform_data {
struct regulator_init_data *reg_init_data[RC5T583_REGULATOR_MAX];
};
-int rc5t583_write(struct device *dev, u8 reg, uint8_t val);
-int rc5t583_read(struct device *dev, uint8_t reg, uint8_t *val);
-int rc5t583_set_bits(struct device *dev, unsigned int reg,
- unsigned int bit_mask);
-int rc5t583_clear_bits(struct device *dev, unsigned int reg,
- unsigned int bit_mask);
-int rc5t583_update(struct device *dev, unsigned int reg,
- unsigned int val, unsigned int mask);
+static inline int rc5t583_write(struct device *dev, uint8_t reg, uint8_t val)
+{
+ struct rc5t583 *rc5t583 = dev_get_drvdata(dev);
+ return regmap_write(rc5t583->regmap, reg, val);
+}
+
+static inline int rc5t583_read(struct device *dev, uint8_t reg, uint8_t *val)
+{
+ struct rc5t583 *rc5t583 = dev_get_drvdata(dev);
+ unsigned int ival;
+ int ret;
+ ret = regmap_read(rc5t583->regmap, reg, &ival);
+ if (!ret)
+ *val = (uint8_t)ival;
+ return ret;
+}
+
+static inline int rc5t583_set_bits(struct device *dev, unsigned int reg,
+ unsigned int bit_mask)
+{
+ struct rc5t583 *rc5t583 = dev_get_drvdata(dev);
+ return regmap_update_bits(rc5t583->regmap, reg, bit_mask, bit_mask);
+}
+
+static inline int rc5t583_clear_bits(struct device *dev, unsigned int reg,
+ unsigned int bit_mask)
+{
+ struct rc5t583 *rc5t583 = dev_get_drvdata(dev);
+ return regmap_update_bits(rc5t583->regmap, reg, bit_mask, 0);
+}
+
+static inline int rc5t583_update(struct device *dev, unsigned int reg,
+ unsigned int val, unsigned int mask)
+{
+ struct rc5t583 *rc5t583 = dev_get_drvdata(dev);
+ return regmap_update_bits(rc5t583->regmap, reg, mask, val);
+}
+
int rc5t583_ext_power_req_config(struct device *dev, int deepsleep_id,
int ext_pwr_req, int deepsleep_slot_nr);
int rc5t583_irq_init(struct rc5t583 *rc5t583, int irq, int irq_base);
--
1.7.9.1
^ permalink raw reply related
* linux-next: build failure after merge of the rcu tree
From: Stephen Rothwell @ 2012-04-16 4:11 UTC (permalink / raw)
To: Paul E. McKenney
Cc: linux-next, linux-kernel, Linus Torvalds, Paul E. McKenney
[-- Attachment #1: Type: text/plain, Size: 579 bytes --]
Hi Paul,
After merging the rcu tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:
fs/binfmt_misc.c: In function 'create_entry':
fs/binfmt_misc.c:314:2: error: implicit declaration of function '_copy_from_user' [-Werror=implicit-function-declaration]
Caused by commit d17faaa53e2e ("fs: Silence bogus copy_to_user() build
errors"). _copy_from_user() appears to only exist for the x86 and tile
architectures ...
I have used the rcu tree from next-20120413 for today.
--
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 akpm with the security tree
From: Stephen Rothwell @ 2012-04-16 5:02 UTC (permalink / raw)
To: Andrew Morton
Cc: linux-next, linux-kernel, Andy Lutomirski, Will Drewry,
James Morris, Cyrill Gorcunov
[-- Attachment #1: Type: text/plain, Size: 2162 bytes --]
Hi Andrew,
Today's linux-next merge of the akpm tree got conflicts in kernel/sys.c
and include/linux/prctl.h between commit 259e5e6c75a9 ("Add PR_{GET,SET}
_NO_NEW_PRIVS to prevent execve from granting privs") from the security
tree and patch "c/r: prctl: add ability to get clear_tid_address" from
the akpm tree.
I fixed them up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc include/linux/prctl.h
index 711e0a3,ecbe30e..0000000
--- a/include/linux/prctl.h
+++ b/include/linux/prctl.h
@@@ -130,19 -130,6 +130,21 @@@
#define PR_SET_CHILD_SUBREAPER 36
#define PR_GET_CHILD_SUBREAPER 37
-#define PR_GET_TID_ADDRESS 38
+/*
+ * If no_new_privs is set, then operations that grant new privileges (i.e.
+ * execve) will either fail or not grant them. This affects suid/sgid,
+ * file capabilities, and LSMs.
+ *
+ * Operations that merely manipulate or drop existing privileges (setresuid,
+ * capset, etc.) will still work. Drop those privileges if you want them gone.
+ *
+ * Changing LSM security domain is considered a new privilege. So, for example,
+ * asking selinux for a specific new context (e.g. with runcon) will result
+ * in execve returning -EPERM.
+ */
+#define PR_SET_NO_NEW_PRIVS 38
+#define PR_GET_NO_NEW_PRIVS 39
+
++#define PR_GET_TID_ADDRESS 40
+
#endif /* _LINUX_PRCTL_H */
diff --cc kernel/sys.c
index 500c885,1d57adf..0000000
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@@ -2082,16 -2092,9 +2092,19 @@@ SYSCALL_DEFINE5(prctl, int, option, uns
error = put_user(me->signal->is_child_subreaper,
(int __user *) arg2);
break;
+ case PR_SET_NO_NEW_PRIVS:
+ if (arg2 != 1 || arg3 || arg4 || arg5)
+ return -EINVAL;
+
+ current->no_new_privs = 1;
+ break;
+ case PR_GET_NO_NEW_PRIVS:
+ if (arg2 || arg3 || arg4 || arg5)
+ return -EINVAL;
+ return current->no_new_privs ? 1 : 0;
+ case PR_GET_TID_ADDRESS:
+ error = prctl_get_tid_address(me, (int __user **)arg2);
+ break;
default:
error = -EINVAL;
break;
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: build failure after merge of the final tree (security tree related)
From: Stephen Rothwell @ 2012-04-16 5:46 UTC (permalink / raw)
To: James Morris
Cc: linux-next, linux-kernel, Will Drewry, H. Peter Anvin, Eric Paris,
Kees Cook
[-- Attachment #1: Type: text/plain, Size: 4514 bytes --]
Hi all,
After merging the final tree, today's linux-next build (powerpc
allnoconfig) failed like this:
arch/powerpc/kernel/ptrace.c: In function 'do_syscall_trace_enter':
arch/powerpc/kernel/ptrace.c:1713:2: error: statement with no effect [-Werror=unused-value]
cc1: all warnings being treated as errors
Introduced by commit acf3b2c71ed2 ("seccomp: add SECCOMP_RET_ERRNO"). I
have applied the following hack fix that fixes the build, but the other
seven call sites of secure_computing() should be fixed up properly.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 16 Apr 2012 15:39:49 +1000
Subject: [PATCH] seccomp: hack fix for build failures with secure_computing
return value change
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
arch/microblaze/kernel/ptrace.c | 2 +-
arch/mips/kernel/ptrace.c | 2 +-
arch/powerpc/kernel/ptrace.c | 2 +-
arch/s390/kernel/ptrace.c | 2 +-
arch/sh/kernel/ptrace_32.c | 2 +-
arch/sh/kernel/ptrace_64.c | 2 +-
arch/sparc/kernel/ptrace_64.c | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/arch/microblaze/kernel/ptrace.c b/arch/microblaze/kernel/ptrace.c
index 6eb2aa9..9e3ffc9 100644
--- a/arch/microblaze/kernel/ptrace.c
+++ b/arch/microblaze/kernel/ptrace.c
@@ -136,7 +136,7 @@ asmlinkage long do_syscall_trace_enter(struct pt_regs *regs)
{
long ret = 0;
- secure_computing(regs->r12);
+ (void)secure_computing(regs->r12);
if (test_thread_flag(TIF_SYSCALL_TRACE) &&
tracehook_report_syscall_entry(regs))
diff --git a/arch/mips/kernel/ptrace.c b/arch/mips/kernel/ptrace.c
index 7c24c29..4f83d73 100644
--- a/arch/mips/kernel/ptrace.c
+++ b/arch/mips/kernel/ptrace.c
@@ -535,7 +535,7 @@ static inline int audit_arch(void)
asmlinkage void syscall_trace_enter(struct pt_regs *regs)
{
/* do the secure computing check first */
- secure_computing(regs->regs[2]);
+ (void)secure_computing(regs->regs[2]);
if (!(current->ptrace & PT_PTRACED))
goto out;
diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c
index 8d8e028..53cebc4 100644
--- a/arch/powerpc/kernel/ptrace.c
+++ b/arch/powerpc/kernel/ptrace.c
@@ -1710,7 +1710,7 @@ long do_syscall_trace_enter(struct pt_regs *regs)
{
long ret = 0;
- secure_computing(regs->gpr[0]);
+ (void)secure_computing(regs->gpr[0]);
if (test_thread_flag(TIF_SYSCALL_TRACE) &&
tracehook_report_syscall_entry(regs))
diff --git a/arch/s390/kernel/ptrace.c b/arch/s390/kernel/ptrace.c
index 02f300f..96e0dea 100644
--- a/arch/s390/kernel/ptrace.c
+++ b/arch/s390/kernel/ptrace.c
@@ -719,7 +719,7 @@ asmlinkage long do_syscall_trace_enter(struct pt_regs *regs)
long ret = 0;
/* Do the secure computing check first. */
- secure_computing(regs->gprs[2]);
+ (void)secure_computing(regs->gprs[2]);
/*
* The sysc_tracesys code in entry.S stored the system
diff --git a/arch/sh/kernel/ptrace_32.c b/arch/sh/kernel/ptrace_32.c
index 9698671..cf55945 100644
--- a/arch/sh/kernel/ptrace_32.c
+++ b/arch/sh/kernel/ptrace_32.c
@@ -503,7 +503,7 @@ asmlinkage long do_syscall_trace_enter(struct pt_regs *regs)
{
long ret = 0;
- secure_computing(regs->regs[0]);
+ (void)secure_computing(regs->regs[0]);
if (test_thread_flag(TIF_SYSCALL_TRACE) &&
tracehook_report_syscall_entry(regs))
diff --git a/arch/sh/kernel/ptrace_64.c b/arch/sh/kernel/ptrace_64.c
index bc81e07..3d3600f 100644
--- a/arch/sh/kernel/ptrace_64.c
+++ b/arch/sh/kernel/ptrace_64.c
@@ -522,7 +522,7 @@ asmlinkage long long do_syscall_trace_enter(struct pt_regs *regs)
{
long long ret = 0;
- secure_computing(regs->regs[9]);
+ (void)secure_computing(regs->regs[9]);
if (test_thread_flag(TIF_SYSCALL_TRACE) &&
tracehook_report_syscall_entry(regs))
diff --git a/arch/sparc/kernel/ptrace_64.c b/arch/sparc/kernel/ptrace_64.c
index 6f97c07..6ddec1f 100644
--- a/arch/sparc/kernel/ptrace_64.c
+++ b/arch/sparc/kernel/ptrace_64.c
@@ -1062,7 +1062,7 @@ asmlinkage int syscall_trace_enter(struct pt_regs *regs)
int ret = 0;
/* do the secure computing check first */
- secure_computing(regs->u_regs[UREG_G1]);
+ (void)secure_computing(regs->u_regs[UREG_G1]);
if (test_thread_flag(TIF_SYSCALL_TRACE))
ret = tracehook_report_syscall_entry(regs);
--
1.7.10.rc3
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply related
* linux-next: build failure after merge of the final tree (regulator tree related)
From: Stephen Rothwell @ 2012-04-16 5:52 UTC (permalink / raw)
To: Mark Brown, Liam Girdwood
Cc: linux-next, linux-kernel, Ying-Chun Liu (PaulLiu)
[-- Attachment #1: Type: text/plain, Size: 1340 bytes --]
Hi all,
After merging the final tree, today's linux-next build (powerpc
allyesconfig) failed like this:
drivers/regulator/da9052-regulator.c: In function 'da9052_regulator_probe':
drivers/regulator/da9052-regulator.c:442:3: error: implicit declaration of function 'of_find_node_by_name' [-Werror=implicit-function-declaration]
drivers/regulator/da9052-regulator.c:442:10: warning: assignment makes pointer from integer without a cast [enabled by default]
drivers/regulator/da9052-regulator.c:446:3: error: implicit declaration of function 'of_get_next_child' [-Werror=implicit-function-declaration]
drivers/regulator/da9052-regulator.c:446:11: warning: assignment makes pointer from integer without a cast [enabled by default]
drivers/regulator/da9052-regulator.c:447:11: warning: assignment makes pointer from integer without a cast [enabled by default]
drivers/regulator/da9052-regulator.c:448:4: error: implicit declaration of function 'of_node_cmp' [-Werror=implicit-function-declaration]
drivers/regulator/da9052-regulator.c:448:23: error: dereferencing pointer to incomplete type
cc1: some warnings being treated as errors
Caused by commit 88c84c14cca4 ("regulator: da9052: add device tree support").
I have reverted that commit for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: build failure after merge of the final tree (sparc-next tree related)
From: Stephen Rothwell @ 2012-04-16 5:59 UTC (permalink / raw)
To: David Miller; +Cc: linux-next, linux-kernel, Tkhai Kirill
[-- Attachment #1: Type: text/plain, Size: 450 bytes --]
Hi all,
After merging the final tree, today's linux-next build (sparc32 defconfig)
failed like this:
arch/sparc/kernel/pcic.c: In function 'pci_time_init':
arch/sparc/kernel/pcic.c:741:2: error: 'timer_cs_period' undeclared (first use in this function)
Caused by commit 62f082830d63 ("sparc32: generic clockevent support").
I have reverted that commit for 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 akpm with the security tree
From: Cyrill Gorcunov @ 2012-04-16 6:08 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Andrew Morton, linux-next, linux-kernel, Andy Lutomirski,
Will Drewry, James Morris
In-Reply-To: <20120416150258.273e076e2d6e3b847d3dd9ca@canb.auug.org.au>
On Mon, Apr 16, 2012 at 03:02:58PM +1000, Stephen Rothwell wrote:
> Hi Andrew,
>
> Today's linux-next merge of the akpm tree got conflicts in kernel/sys.c
> and include/linux/prctl.h between commit 259e5e6c75a9 ("Add PR_{GET,SET}
> _NO_NEW_PRIVS to prevent execve from granting privs") from the security
> tree and patch "c/r: prctl: add ability to get clear_tid_address" from
> the akpm tree.
>
> I fixed them up (see below) and can carry the fix as necessary.
Thanks, Stephen.
Cyrill
^ permalink raw reply
* linux-next: Tree for Apr 16
From: Stephen Rothwell @ 2012-04-16 6:11 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 29679 bytes --]
Hi all,
Changes since 20120413:
The devicetree-current tree still had its build failure so I used the
version from next-20120410.
The sparc-next tree gained a build failure for which I reverted a commit.
The v4l-dvb tree still had its build failure so I used the version from
next-20120410.
The wireless-next tree lost a conflict but gained more gained against the
net-next tree.
The security tree gained a conflict against the net-next tree and a build
failure for which I applied a patch.
The regulator tree gained a build failure for which I reverted a commit.
The tip tree lost its conflict.
The rcu tree gained a build failure so I used the version from
next-20120413.
The tty tree lost its boot failure.
The irqdomain tree lost its conflict.
The arm-soc tree lost its conflict.
The akpm tree gained a conflict against the security tree and lost a
patch that turned up elsewhere.
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/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 27 trees of patches pending
for Linus' tree), more are welcome (even if they are currently empty).
Thanks to those who have contributed, and to those who haven't, please do.
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds. And to Paul
Gortmaker for triage and bug fixes.
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 (9a8e5d4 Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm)
Merging fixes/master (b1a808f Merge branch 'for-next' of git://gitorious.org/kernel-hsi/kernel-hsi)
Merging kbuild-current/rc-fixes (0eb043d Subject: [PATCH] tags.sh: Add missing quotes)
Merging arm-current/fixes (708e5978 ARM: 7386/1: jump_label: fixup for rename to static_key)
Merging m68k-current/for-linus (450aed7 m68k/q40: Add missing platform check before registering platform devices)
Merging powerpc-merge/merge (fae2e0f powerpc: Fix typo in runlatch code)
Merging sparc/master (7d93101 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc)
Merging scsi-rc-fixes/master (41f8ad7 [SCSI] osd_uld: Bump MAX_OSD_DEVICES from 64 to 1,048,576)
Merging net/master (8a9a0ea net/ethernet: ks8851_mll fix rx frame buffer overflow)
Merging sound-current/for-linus (7d7eb9e ALSA: hda/realtek - Fix mem leak (and rid us of trailing whitespace).)
Merging pci-current/for-linus (314489b Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc)
Merging wireless/master (428ca8a mwifiex: update pcie8766 scratch register addresses)
Merging driver-core.current/driver-core-linus (282029c kobject: provide more diagnostic info for kobject_add_internal() failures)
Merging tty.current/tty-linus (11bbd5b pch_uart: Add Kontron COMe-mTT10 uart clock quirk)
Merging usb.current/usb-linus (9de2922 USB: update usbtmc api documentation)
Merging staging.current/staging-linus (474a898 staging: android: fix mem leaks in __persistent_ram_init())
Merging char-misc.current/char-misc-linus (0034102 Linux 3.4-rc2)
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 (0e3d0f3 Input: da9052 - fix memory leak in da9052_onkey_probe())
Merging md-current/for-linus (afbaa90 md/bitmap: prevent bitmap_daemon_work running while initialising bitmap)
Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix)
Merging crypto-current/master (511d63c crypto: talitos - properly lock access to global talitos registers)
Merging ide/master (0ab3d8b cy82c693: fix PCI device selection)
Merging dwmw2/master (244dc4e Merge git://git.infradead.org/users/dwmw2/random-2.6)
Merging sh-current/sh-fixes-for-linus (691c01c arch/sh/drivers/dma/{dma-g2,dmabrg}.c: ensure arguments to request_irq and free_irq are compatible)
Merging irqdomain-current/irqdomain/merge (15e06bf irqdomain: Fix debugfs formatting)
Merging devicetree-current/devicetree/merge (e46c11b of/irq: add empty irq_of_parse_and_map() for non-dt builds)
$ git reset --hard HEAD^
Merging refs/next/20120410/devicetree-current
Merging spi-current/spi/merge (39ec0d3 spi/imx: prevent NULL pointer dereference in spi_imx_probe())
Merging gpio-current/gpio/merge (9a5c7d6 gpio/exynos: Fix compiler warning in gpio-samsung.c file)
Merging arm/for-next (708e5978 ARM: 7386/1: jump_label: fixup for rename to static_key)
Merging arm-perf/for-next/perf (c16fa4f Linux 3.3)
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 (9ab15ea ARM: EXYNOS: add dts files to dtbs target)
Merging xilinx/arm-next (b85a3ef ARM: Xilinx: Adding Xilinx board support)
Merging blackfin/for-linus (35fe2e7 blackfin: update defconfig for bf527-ezkit)
Merging c6x/for-linux-next (fde7d90 Linux 3.3-rc7)
Merging cris/for-next (9c75fc8 CRIS: Remove legacy RTC drivers)
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 (9d38e66 [IA64] Fix futex_atomic_cmpxchg_inatomic())
Merging m68k/for-next (03c63c1 m68k/mm: Port OOM changes to do_page_fault())
Merging m68knommu/for-next (de6bd4f m68k: merge the MMU and non-MMU signal.c code)
Merging microblaze/next (258f742 modpost: Fix modpost license checking of vmlinux.o)
Merging mips/mips-for-linux-next (2fea377 Merge branch 'fixes-for-linus' into mips-for-linux-next)
Merging openrisc/for-upstream (c88e692 asm-generic: add linux/types.h to cmpxchg.h)
Merging parisc/for-next (c60dc74 Merge branch 'fixes' into for-next)
Merging powerpc/next (0195c00 Merge tag 'split-asm_system_h-for-linus-20120328' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-asm_system)
Merging 4xx/next (b5594a7 powerpc/44x: Add additional device support for APM821xx SoC and Bluestone board)
Merging mpc5xxx/next (09f61ff powerpc: Option FB_FSL_DIU is not really optional for mpc512x)
Merging galak/next (fa1b42b powerpc/qe: Update the SNUM table for MPC8569 Rev2.0)
Merging s390/features (affbb42 [S390] Fix compile error in swab.h)
Merging sh/sh-latest (ee56510 MAINTAINERS: Update git URL for SH.)
Merging sparc-next/master (62f0828 sparc32: generic clockevent support)
Merging tile/master (a46bf6d arch/tile: tilegx PCI root complex support)
Merging unicore32/unicore32 (0994695 Merge branch 'akpm' (aka "Andrew's patch-bomb, take two"))
Merging ceph/master (c666601 rbd: move snap_rwsem to the device, rename to header_rwsem)
Merging cifs/master (bfa890a Fix number parsing in cifs_parse_mount_options)
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 (c2d9fae ext2: Remove s_dirt handling)
Merging ext4/dev (9d547c3 vfs: remove unused superblock helpers)
Merging fuse/for-next (c628ee6 fuse: use flexible array in fuse.h)
Merging gfs2/master (c9b17f7 GFS2: Use variable rather than qa to determine if unstuff necessary)
Merging logfs/master (cd8bfa9 logfs: initialize the number of iovecs in bio)
Merging nfs/linux-next (f30fb85 NFS: check for req==NULL in nfs_try_to_update_request cleanup)
Merging nfsd/nfsd-next (e3f70ea Lockd: pass network namespace to creation and destruction routines)
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 (01627d9 Merge branch 'drm-fixes-intel' of git://people.freedesktop.org/~airlied/linux)
Merging ubifs/linux-next (297fe33 UBIFS: remove douple initialization in change_category())
Merging xfs/for-next (0034102 Linux 3.4-rc2)
Merging vfs/for-next (8792bd8 vfs: take i_mutex on renamed file)
Merging pci/next (314489b Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc)
Merging hid/for-next (4ba1b01 Merge branch 'upstream' into for-next)
Merging quilt/i2c (85bb1a8 i2c-dev: Add support for I2C_M_RECV_LEN)
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 (e3a9568 hwmon: Add MCP3021 ADC driver)
Merging hwmon-staging/hwmon-next (09b4bf6 acpi_power_meter: clean up code around setup_attrs)
Merging v4l-dvb/master (eb56984 Merge /home/v4l/v4l/for_upstream)
$ git reset --hard HEAD^
Merging refs/next/20120410/v4l-dvb
Merging kbuild/for-next (51cbc3e Merge branch 'kbuild/rc-fixes' 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 (c72adfd be2net: Add functionality to support RoCE driver)
Merging acpi/next (eeaab2d Merge branches 'idle-fix' and 'misc' into release)
Merging cpupowerutils/master (f166033 cpupower tools: add install target to the debug tools' makefiles)
Merging ieee1394/for-next (19f8399 Merge branch 'iso-flush' into for-next)
Merging ubi/linux-next (0034102 Linux 3.4-rc2)
Merging dlm/next (1b189b8 dlm: last element of dlm_local_addr[] never used)
Merging scsi/master (6993169 [SCSI] ipr: Driver version 2.5.3)
Merging target-updates/for-next (bfb79ea target/iscsi: Go back to core allocating data buffer for cmd)
Merging target-merge/for-next-merge (3e6e9e9 sbp-target: Initial merge of firewire/ieee-1394 target mode support)
Merging ibft/linux-next (935a9fe ibft: Fix finding IBFT ACPI table on UEFI)
Merging isci/all (475448a merge: libsas devel rnc-devel fixes)
Merging slave-dma/next (91ae1e3 dmaengine: mxs-dma: assign cookie in prepare)
Merging dmaengine/next (a2bd114 netdma: adding alignment check for NETDMA ops)
Merging net-next/master (56845d7 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging wireless-next/master (94a2ca3 brcm80211: smac: only provide valid regulatory hint)
CONFLICT (content): Merge conflict in include/net/nfc/nfc.h
CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-testmode.c
Applying: NFC: fix up for NLA_PUT_ api changes
Applying: cfg80211: fix up for NLA_PUT_ api changes
Merging bluetooth/master (d1db63f Bluetooth: mgmt: Remove unwanted goto statements)
Merging mtd/master (7b0e67f mtd: docg3 add protection against concurrency)
Merging l2-mtd/master (4ac50fc mtd: docg3 fix in-middle of blocks reads)
Merging crypto/master (d788fec crypto, xor: Sanitize checksumming function selection output)
Merging sound/for-next (06d9958 Merge branch 'topic/misc' into for-next)
Merging sound-asoc/for-next (0de11ff Merge branch 'for-3.5' into asoc-next)
Merging cpufreq/next (a7b422c provide disable_cpufreq() function to disable the API.)
Merging quilt/rr (2a22b63 cpumask: remove old cpu_*_map.)
CONFLICT (content): Merge conflict in init/main.c
CONFLICT (content): Merge conflict in drivers/virtio/virtio_balloon.c
CONFLICT (content): Merge conflict in arch/arm/kernel/kprobes.c
Merging input/next (b5e9528 Input: ep93xx_keypad - switch to using dev_pm_ops)
Merging input-mt/for-next (0034102 Linux 3.4-rc2)
Merging cgroup/for-next (86f82d5 cgroup: remove cgroup_subsys->populate())
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
Merging block/for-next (f52b69f Merge tag 'sh-for-linus' of git://github.com/pmundt/linux-sh)
Merging quilt/device-mapper (025716f Fix a memory leak inadvertently introduced during simplification of cell_release_singleton() in commit 6f94a4c45a6f744383f9f695dde019998db3df55 ("dm thin: fix stacked bi_next usage").)
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)
Merging mmc/mmc-next (a334b95 mmc: remove imxmmc driver)
Merging kgdb/kgdb-next (3751d3e x86,kgdb: Fix DEBUG_RODATA limitation using text_poke())
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 (54800d2 lib/raid6: fix test program build)
Merging mfd/for-next (b8589e2 gpio/twl: Add DT support to gpio-twl4030 driver)
Merging battery/master (5cdd4d7 max17042_battery: Clean up interrupt handling)
Merging drm/drm-next (9f13c87 mm: fixup compilation error due to an asm write through a const pointer)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_i2c.c
Merging fbdev/fbdev-next (688ec34 video: pxa3xx-gcu: Simplify the logic to exit while loop in pxa3xx_gcu_wait_idle)
Merging viafb/viafb-next (838ac78 viafb: avoid refresh and mode lookup in set_par)
Merging omap_dss2/for-next (df01d53 OMAPDSS: APPLY: fix clearing shadow dirty flag with manual update)
Merging regulator/for-next (19b15db Merge branch 'regulator-drivers' into regulator-next)
Merging security/next (8ac270d Documentation: prctl/seccomp_filter)
CONFLICT (content): Merge conflict in include/linux/filter.h
Merging selinux/master (c737f82 SELinux: remove unused common_audit_data in flush_unauthorized_files)
Merging lblnet/master (7e27d6e Linux 2.6.35-rc3)
Merging watchdog/master (0034102 Linux 3.4-rc2)
Merging dwmw2-iommu/master (c3b92c8 Linux 3.1)
Merging iommu/next (7de4730 Merge branches 'iommu/fixes', 'arm/tegra' and 'x86/amd' into next)
Merging osd/linux-next (72749a2 exofs: Cap on the memcpy() size)
Merging jc_docs/docs-next (5c050fb docs: update the development process document)
Merging trivial/for-next (35fca53 mmzone: fix comment typo coelesce -> coalesce)
Merging audit/for-next (dcd6c92 Linux 3.3-rc1)
Merging pm/linux-next (c4772d1 PM / QoS: add pm_qos_update_request_timeout() API)
Merging apm/for-next (f283d22 APM: fix deadlock in APM_IOC_SUSPEND ioctl)
Merging fsnotify/for-next (1aec9c0 inotify: automatically restart syscalls)
Merging edac/linux_next (a4b4be3 edac: rename channel_info to rank_info)
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)
Merging spi/spi/next (d57a428 spi/devicetree: Move devicetree support code into spi directory)
Merging tip/auto-latest (e171081 Merge branch 'perf/urgent')
Merging rcu/rcu/next (2f28bbb rcu: Inline preemptible RCU __rcu_read_lock())
$ git reset --hard HEAD^
Merging refs/next/20120413/rcu
Merging cputime/cputime (c3e0ef9 [S390] fix cputime overflow in uptime_proc_show)
Merging uprobes/for-next (0326f5a uprobes/core: Handle breakpoint and singlestep exceptions)
Merging kmemleak/kmemleak (d65b4e9 Linux 3.3-rc3)
Merging kvm/linux-next (e087592 KVM: Resolve RCU vs. async page fault problem)
Merging oprofile/for-next (c16fa4f Linux 3.3)
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 (2efe928 Merge branch 'stable/for-linus-3.4' into linux-next)
CONFLICT (content): Merge conflict in arch/x86/kernel/apic/io_apic.c
CONFLICT (content): Merge conflict in arch/x86/include/asm/io_apic.h
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 (d3283fb trace: Remove unused workqueue tracer)
Merging drivers-x86/linux-next (86924de acer-wmi: add quirk table for video backlight vendor mode)
Merging hwpoison/hwpoison (46e387b Merge branch 'hwpoison-hugepages' into hwpoison)
Merging sysctl/master (4e474a0 sysctl: protect poll() in entries that may go away)
Merging regmap/for-next (b076764 Merge branch 'regmap-stride' into regmap-next)
Merging hsi/for-next (43139a6 HSI: hsi_char: Update ioctl-number.txt)
Merging driver-core/driver-core-next (8f1e125 w1: Disable irqs during 1-wire bus operations, extend 1-wire reset pulse)
Merging tty/tty-next (86b26007 TTY: con3215, use tty from tty_port)
Merging usb/usb-next (af58105 USB: io_ti: fix abuse of interface data)
Merging staging/staging-next (234bb3c staging: comedi: Add kernel config for default buffer sizes)
Merging char-misc/char-misc-next (0034102 Linux 3.4-rc2)
Merging tmem/linux-next (9c9fc31 Merge commit 'e22057c8599373e5caef0bc42bdb95d2a361ab0d' into linux-next)
Merging writeback/writeback-for-next (697e6fe 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 (4fd55dd pinctrl: ifdef CONFIG_DEBUG_FS cleanup)
Merging tegra/for-next (4c616c4 Merge branch 'for-3.5/tegra30-audio' into for-next)
Merging moduleh/for-sfr (ef1f098 irq_work: fix compile failure on tile from missing include)
Merging vhost/linux-next (4f48380 virtio_blk: Drop unused request tracking list)
Merging kmap_atomic/kmap_atomic (317b6e1 feature-removal-schedule.txt: schedule the deprecated form of kmap_atomic() for removal)
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/)
Merging irqdomain/irqdomain/next (e7cc3ac dt: fix twl4030 for non-dt compile on x86)
Merging gpio/gpio/next (f141ed6 gpio: Move DT support code into drivers/gpio)
Merging arm-soc/for-next (0ba4514 Merge branch 'next/dt' into for-next)
Merging kvmtool/master (0333eec kvm tools: Update README for CONFIG_FB_VESA)
Merging dma-mapping/dma-mapping-next (0034102 Linux 3.4-rc2)
Merging dma-buf/for-next (9f28056 dma-buf: Correct dummy function declarations.)
CONFLICT (content): Merge conflict in include/linux/dma-buf.h
Merging ktest/for-next (648a182 ktest: Allow a test to override REBOOT_ON_SUCCESS)
Merging cpuidle-cons/cpuidle_consol_pull (203b52e SH: shmobile: Consolidate time keeping and irq enable)
CONFLICT (content): Merge conflict in include/linux/cpuidle.h
CONFLICT (content): Merge conflict in drivers/cpuidle/cpuidle.c
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/cpuidle.c
CONFLICT (content): Merge conflict in arch/arm/mach-davinci/cpuidle.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/cpuidle.c
CONFLICT (add/add): Merge conflict in arch/arm/include/asm/cpuidle.h
Merging scsi-post-merge/merge-base:master ()
$ git checkout akpm
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: umem: fix up unplugging
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: arch/x86/include/asm/spinlock.h: fix comment
Applying: arch/x86/kernel/apic/io_apic.c: move io_apic_level_ack_pending() inside CONFIG_GENERIC_PENDING_IRQ
Applying: drivers/xen/Kconfig: fix Kconfig layout
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: 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: cpuidle: remove unused hrtimer_peek_ahead_timers() call
Applying: cris: use set_current_blocked() and block_sigmask()
Applying: cris: select GENERIC_ATOMIC64
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: net: use this_cpu_xxx replace percpu_xxx funcs
Applying: percpu: remove percpu_xxx() functions
Applying: percpu-remove-percpu_xxx-functions-fix
Applying: timeconst.pl: remove deprecated defined(@array)
Applying: ia64: use set_current_blocked() and block_sigmask()
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: h8300: use set_current_blocked() and block_sigmask()
Applying: unicore32: use block_sigmask()
Applying: blackfin: use set_current_blocked() and block_sigmask()
Applying: ocfs2: use find_last_bit()
Applying: ocfs2: use bitmap_weight()
Applying: drivers/scsi/ufs: use module_pci_driver
Applying: vfs: increment iversion when a file is truncated
Applying: fs: symlink restrictions on sticky directories
Applying: fs: hardlink creation restrictions
Applying: fsnotify: remove unused parameter from send_to_group()
Applying: fsnotify: handle subfiles' perm events
Applying: brlocks/lglocks: cleanups
Applying: mm/memory_failure: let the compiler add the function name
Applying: mm/mempolicy.c: use enum value MPOL_REBIND_ONCE in mpol_rebind_policy()
Applying: mm/hugetlb.c: use long vars instead of int in region_count()
Applying: mm, thp: remove unnecessary ret variable
Applying: mm, thp: allow fallback when pte_alloc_one() fails for huge pmd
Applying: mm: vmscan: remove lumpy reclaim
Applying: mm: vmscan: remove reclaim_mode_t
Applying: mm: remove swap token code
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: fix/change behavior of shared anon at moving task
Applying: memcg swap: mem_cgroup_move_swap_account never needs fixup
Applying: memcg swap: use mem_cgroup_uncharge_swap()
Applying: mm/memcg: scanning_global_lru means mem_cgroup_disabled
Applying: mm/memcg: move reclaim_stat into lruvec
Applying: mm: push lru index into shrink_[in]active_list()
Applying: mm-push-lru-index-into-shrink_active_list-fix
Applying: mm: mark mm-inline functions as __always_inline
Applying: mm: remove lru type checks from __isolate_lru_page()
Applying: mm/memcg: kill mem_cgroup_lru_del()
Applying: memcg: mark more functions/variables as static
Applying: memcg: remove unused variable
Applying: memcg: mark stat field of mem_cgroup struct as __percpu
Applying: memcg: remove redundant parentheses
Applying: memcg: make threshold index in the right position
Applying: memcg: revise the position of threshold index while unregistering event
Applying: mm/memcg: use vm_swappiness from target memory cgroup
Applying: security/keys/keyctl.c: suppress memory allocation failure warning
Applying: frv: use set_current_blocked() and block_sigmask()
Applying: um/kernel/trap.c: port OOM changes to handle_page_fault()
Applying: sgi-xp: use lockdep_assert_held()
Applying: drivers/scsi/aha152x.c: remove broken usage of spin_is_locked()
Applying: XFS: fix lock ASSERT on UP
Applying: mm/huge_memory.c: use lockdep_assert_held()
Applying: futex: use lockdep_assert_held() for lock checking
Applying: drivers/net/irda/sir_dev.c: remove spin_is_locked()
Applying: drivers/net/ethernet/smsc/smsc911x.h: use lockdep_assert_held() instead of home grown buggy construct
Applying: spinlocks.txt: add a discussion on why spin_is_locked() is bad
Applying: spinlockstxt-add-a-discussion-on-why-spin_is_locked-is-bad-fix
Applying: include/linux/spinlock.h: add a kerneldoc comment to spin_is_locked() that discourages its use
Applying: checkpatch: check for spin_is_locked()
Applying: parisc: use set_current_blocked() and block_sigmask()
Applying: vsprintf: further optimize decimal conversion
Applying: vsprintf-further-optimize-decimal-conversion-v2
Applying: vsprintf-further-optimize-decimal-conversion-checkpatch-fixes
Applying: hamradio/scc: orphan driver in MAINTAINERS
Applying: MAINTAINERS: remove Alessandro
Applying: blacklight: remove redundant spi driver bus initialization
Applying: drivers/leds/leds-lp5521.c: fix lp5521_read() error handling
Applying: leds: driver for DA9052/53 PMIC v2
Applying: leds-led-module-for-da9052-53-pmic-v2-fix
Applying: leds: add LED driver for lm3556 chip
Applying: leds-add-led-driver-for-lm3556-chip-checkpatch-fixes
Applying: leds: simple_strtoul() cleanup
Applying: list_debug: WARN for adding something already in the list
Applying: lib/test-kstrtox.c: mark const init data with __initconst instead of __initdata
Applying: checkpatch: suggest pr_<level> over printk(KERN_<LEVEL>
Applying: rtc/spear: add Device Tree probing capability
Applying: drivers/rtc/rtc-ep93xx.c: convert to use module_platform_driver()
Applying: rtc: add ioctl to get/clear battery low voltage status
Applying: drivers/rtc/rtc-pcf8563.c: add RTC_VL_READ/RTC_VL_CLR ioctl feature
Applying: drivers/rtc/Kconfig: place RTC_DRV_IMXDI and RTC_MXC under "on-CPU RTC drivers"
Applying: rtc: rename CONFIG_RTC_MXC to CONFIG_RTC_DRV_MXC
Applying: rtc-rename-config_rtc_mxc-to-config_rtc_drv_mxc-fix
Applying: HPFS: remove PRINTK() macro
Applying: kmod: unexport call_usermodehelper_freeinfo()
Applying: kmod: convert two call sites to call_usermodehelper_fns()
Applying: kmod: move call_usermodehelper_fns() to .c file and unexport all it's helpers
Applying: kmod: avoid deadlock from recursive kmod call
Applying: proc: clean up /proc/<pid>/environ handling
Applying: proc-clean-up-proc-pid-environ-handling-checkpatch-fixes
Applying: proc: unify ptrace_may_access() locking code
Applying: proc: remove mm_for_maps()
Applying: proc: use mm_access() instead of ptrace_may_access()
Applying: proc: use IS_ERR_OR_NULL()
Applying: ipc/sem.c: alternatives to preempt_disable()
Applying: rapidio: add DMA engine support for RIO data transfers
Applying: rapidio/tsi721: add DMA engine support
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 comment update
Applying: syscalls-x86-add-__nr_kcmp-syscall-v8-comment-update-fix
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: c/r: prctl: add ability to set new mm_struct::exe_file
Applying: c/r: prctl: add ability to get clear_tid_address
CONFLICT (content): Merge conflict in kernel/sys.c
CONFLICT (content): Merge conflict in include/linux/prctl.h
Applying: c/r: ipc: message queue receive cleanup
Applying: c/r: ipc: message queue stealing feature introduced
Applying: ramoops: use pstore interface
Applying: ramoops: fix printk format warnings
Applying: notify_change(): check that i_mutex is held
Merging akpm (9bb7952 notify_change(): check that i_mutex is held)
Applying: seccomp: hack fix for build failures with secure_computing return value change
[master 27d19d1] Revert "regulator: da9052: add device tree support"
[master 4380d61] Revert "sparc32: generic clockevent support"
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next: build failure after merge of the final tree (sparc-next tree related)
From: David Miller @ 2012-04-16 6:16 UTC (permalink / raw)
To: sfr; +Cc: linux-next, linux-kernel, tkhai, sam
In-Reply-To: <20120416155907.32c0041caa002f72da4635b7@canb.auug.org.au>
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 16 Apr 2012 15:59:07 +1000
> After merging the final tree, today's linux-next build (sparc32 defconfig)
> failed like this:
>
> arch/sparc/kernel/pcic.c: In function 'pci_time_init':
> arch/sparc/kernel/pcic.c:741:2: error: 'timer_cs_period' undeclared (first use in this function)
>
> Caused by commit 62f082830d63 ("sparc32: generic clockevent support").
>
> I have reverted that commit for today.
Sam, Tkhai, please fix this.
^ permalink raw reply
* Re: [PATCH] mfd: fix modular builds of rc5t583 regulator support
From: Laxman Dewangan @ 2012-04-16 6:54 UTC (permalink / raw)
To: Paul Gortmaker
Cc: sameo@linux.intel.com, broonie@opensource.wolfsonmicro.com,
linux-kernel@vger.kernel.org, linux-next@vger.kernel.org
In-Reply-To: <1334549301-32114-1-git-send-email-paul.gortmaker@windriver.com>
On Monday 16 April 2012 09:38 AM, Paul Gortmaker wrote:
> The combination of commit 1b1247dd75aa5cf5fae54a3bec7280046e9c7957
>
> "mfd: Add support for RICOH PMIC RC5T583"
>
> and commit 6ffc3270210efa2bea526953a142ffc908f5bd86
>
> "regulator: Add support for RICOH PMIC RC5T583 regulator"
>
> are causing the i386 allmodconfig builds to fail with this:
>
> ERROR: "rc5t583_update" [drivers/regulator/rc5t583-regulator.ko] undefined!
> ERROR: "rc5t583_set_bits" [drivers/regulator/rc5t583-regulator.ko] undefined!
> ERROR: "rc5t583_clear_bits" [drivers/regulator/rc5t583-regulator.ko] undefined!
> ERROR: "rc5t583_read" [drivers/regulator/rc5t583-regulator.ko] undefined!
>
> and this:
>
> ERROR: "rc5t583_ext_power_req_config" [drivers/regulator/rc5t583-regulator.ko] undefined!
>
> For the 1st four, make the simple ops static inline, instead of
> polluting the namespace with trivial exports. For the last one,
> add an EXPORT_SYMBOL.
>
> Signed-off-by: Paul Gortmaker<paul.gortmaker@windriver.com>
> ---
>
> [ alternately, make REGULATOR_RC5T583 bool instead of tristate? ]
Why not export all require symbol from mfd core.
I am sending the patch to exporting all required apis. Please review.
^ permalink raw reply
* [PATCH V1] mfd: rc5t583: Fix build error
From: Laxman Dewangan @ 2012-04-16 6:52 UTC (permalink / raw)
To: sameo, broonie, linux-kernel, linux-next, paul.gortmaker; +Cc: Laxman Dewangan
Fixing following build error:
ERROR: "rc5t583_ext_power_req_config" [drivers/regulator/rc5t583-regulator.ko] undefined!
ERROR: "rc5t583_update" [drivers/regulator/rc5t583-regulator.ko] undefined!
ERROR: "rc5t583_set_bits" [drivers/regulator/rc5t583-regulator.ko] undefined!
ERROR: "rc5t583_clear_bits" [drivers/regulator/rc5t583-regulator.ko] undefined!
ERROR: "rc5t583_read" [drivers/regulator/rc5t583-regulator.ko] undefined!
make[1]: *** [__modpost] Error 1
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
---
The above build error is reported by Paul.
The error is appearing when MFD_RC5T583 is selcted as y and
REGULATOR_RC5T583 is selected as module.
in this case, mfd driver should actually export the public API.
drivers/mfd/rc5t583.c | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/drivers/mfd/rc5t583.c b/drivers/mfd/rc5t583.c
index 99ef944..a2aa6d9 100644
--- a/drivers/mfd/rc5t583.c
+++ b/drivers/mfd/rc5t583.c
@@ -96,6 +96,7 @@ int rc5t583_read(struct device *dev, uint8_t reg, uint8_t *val)
*val = (uint8_t)ival;
return ret;
}
+EXPORT_SYMBOL_GPL(rc5t583_read);
int rc5t583_set_bits(struct device *dev, unsigned int reg,
unsigned int bit_mask)
@@ -103,6 +104,8 @@ int rc5t583_set_bits(struct device *dev, unsigned int reg,
struct rc5t583 *rc5t583 = dev_get_drvdata(dev);
return regmap_update_bits(rc5t583->regmap, reg, bit_mask, bit_mask);
}
+EXPORT_SYMBOL_GPL(rc5t583_set_bits);
+
int rc5t583_clear_bits(struct device *dev, unsigned int reg,
unsigned int bit_mask)
@@ -110,6 +113,7 @@ int rc5t583_clear_bits(struct device *dev, unsigned int reg,
struct rc5t583 *rc5t583 = dev_get_drvdata(dev);
return regmap_update_bits(rc5t583->regmap, reg, bit_mask, 0);
}
+EXPORT_SYMBOL_GPL(rc5t583_clear_bits);
int rc5t583_update(struct device *dev, unsigned int reg,
unsigned int val, unsigned int mask)
@@ -117,6 +121,7 @@ int rc5t583_update(struct device *dev, unsigned int reg,
struct rc5t583 *rc5t583 = dev_get_drvdata(dev);
return regmap_update_bits(rc5t583->regmap, reg, mask, val);
}
+EXPORT_SYMBOL_GPL(rc5t583_update);
static int __rc5t583_set_ext_pwrreq1_control(struct device *dev,
int id, int ext_pwr, int slots)
@@ -197,6 +202,7 @@ int rc5t583_ext_power_req_config(struct device *dev, int ds_id,
ds_id, ext_pwr_req);
return 0;
}
+EXPORT_SYMBOL_GPL(rc5t583_ext_power_req_config);
static int rc5t583_clear_ext_power_req(struct rc5t583 *rc5t583,
struct rc5t583_platform_data *pdata)
--
1.7.1.1
^ permalink raw reply related
* Re: linux-next: build failure after merge of the final tree (sparc-next tree related)
From: Kirill Tkhai @ 2012-04-16 7:45 UTC (permalink / raw)
To: David Miller
Cc: sfr@canb.auug.org.au, linux-next@vger.kernel.org,
linux-kernel@vger.kernel.org, sam@ravnborg.org, Tkhai Kirill
In-Reply-To: <20120416.021613.606704342231219042.davem@davemloft.net>
16.04.2012, 10:16, "David Miller" <davem@davemloft.net>:
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 16 Apr 2012 15:59:07 +1000
>
>> After merging the final tree, today's linux-next build (sparc32 defconfig)
>> failed like this:
>>
>> arch/sparc/kernel/pcic.c: In function 'pci_time_init':
>> arch/sparc/kernel/pcic.c:741:2: error: 'timer_cs_period' undeclared (first use in this function)
>>
>> Caused by commit 62f082830d63 ("sparc32: generic clockevent support").
>>
>> I have reverted that commit for today.
>
> Sam, Tkhai, please fix this.
Hi! This place is a mix from two last patches. The fix is below.
Regards,
KT
P.S. I'm sending the message from a web mail client to answer faster. I hope, it won't be problems.
---
arch/sparc/kernel/pcic.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/sparc/kernel/pcic.c b/arch/sparc/kernel/pcic.c
index 118a3f5..866aa34 100644
--- a/arch/sparc/kernel/pcic.c
+++ b/arch/sparc/kernel/pcic.c
@@ -738,7 +738,7 @@ void __init pci_time_init(void)
* It's in SBUS dimension, because timer_cs is in this dimension.
* We take into account this in pcic_cycles_offset()
*/
- timer_cs_period = SBUS_CLOCK_RATE / HZ;
+ sparc_config.cs_period = SBUS_CLOCK_RATE / HZ;
sparc_config.features |= FEAT_L10_CLOCKEVENT;
#endif
sparc_config.features |= FEAT_L10_CLOCKSOURCE;
^ permalink raw reply related
* Re: [PATCH] mfd: fix modular builds of rc5t583 regulator support
From: Paul Gortmaker @ 2012-04-16 14:12 UTC (permalink / raw)
To: Laxman Dewangan
Cc: sameo@linux.intel.com, broonie@opensource.wolfsonmicro.com,
linux-kernel@vger.kernel.org, linux-next@vger.kernel.org
In-Reply-To: <4F8BC20A.2090105@nvidia.com>
On 12-04-16 02:54 AM, Laxman Dewangan wrote:
> On Monday 16 April 2012 09:38 AM, Paul Gortmaker wrote:
>> The combination of commit 1b1247dd75aa5cf5fae54a3bec7280046e9c7957
>>
>> "mfd: Add support for RICOH PMIC RC5T583"
>>
>> and commit 6ffc3270210efa2bea526953a142ffc908f5bd86
>>
>> "regulator: Add support for RICOH PMIC RC5T583 regulator"
>>
>> are causing the i386 allmodconfig builds to fail with this:
>>
>> ERROR: "rc5t583_update" [drivers/regulator/rc5t583-regulator.ko] undefined!
>> ERROR: "rc5t583_set_bits" [drivers/regulator/rc5t583-regulator.ko] undefined!
>> ERROR: "rc5t583_clear_bits" [drivers/regulator/rc5t583-regulator.ko] undefined!
>> ERROR: "rc5t583_read" [drivers/regulator/rc5t583-regulator.ko] undefined!
>>
>> and this:
>>
>> ERROR: "rc5t583_ext_power_req_config" [drivers/regulator/rc5t583-regulator.ko] undefined!
>>
>> For the 1st four, make the simple ops static inline, instead of
>> polluting the namespace with trivial exports. For the last one,
>> add an EXPORT_SYMBOL.
>>
>> Signed-off-by: Paul Gortmaker<paul.gortmaker@windriver.com>
>> ---
>>
>> [ alternately, make REGULATOR_RC5T583 bool instead of tristate? ]
>
> Why not export all require symbol from mfd core.
> I am sending the patch to exporting all required apis. Please review.
As I said in the commit log, it doesn't seem to make sense to export
them when they are trivial enough to be static inline, since it
avoids having them pollute the /proc/kallsyms namespace.
It is almost like having basic inb/outb as functions vs inline; it
just doesn't make sense to me.
However, if you are determined to rewrite the patch in another way,
please add the customary reported-by line.
Thanks,
Paul.
^ permalink raw reply
* Re: [PATCH] mfd: fix modular builds of rc5t583 regulator support
From: Laxman Dewangan @ 2012-04-16 14:02 UTC (permalink / raw)
To: Paul Gortmaker
Cc: sameo@linux.intel.com, broonie@opensource.wolfsonmicro.com,
linux-kernel@vger.kernel.org, linux-next@vger.kernel.org
In-Reply-To: <4F8C28C5.9070308@windriver.com>
On Monday 16 April 2012 07:42 PM, Paul Gortmaker wrote:
> On 12-04-16 02:54 AM, Laxman Dewangan wrote:
>> On Monday 16 April 2012 09:38 AM, Paul Gortmaker wrote:
>>
> As I said in the commit log, it doesn't seem to make sense to export
> them when they are trivial enough to be static inline, since it
> avoids having them pollute the /proc/kallsyms namespace.
>
> It is almost like having basic inb/outb as functions vs inline; it
> just doesn't make sense to me.
>
> However, if you are determined to rewrite the patch in another way,
> please add the customary reported-by line.
>
I am fine on either way i.e. inline or exporting symbols only.
^ permalink raw reply
* Re: linux-next: build failure after merge of the final tree (security tree related)
From: Will Drewry @ 2012-04-16 15:32 UTC (permalink / raw)
To: Stephen Rothwell
Cc: James Morris, linux-next, linux-kernel, H. Peter Anvin,
Eric Paris, Kees Cook
In-Reply-To: <20120416154607.302f7ae245472e1e917dacef@canb.auug.org.au>
On Mon, Apr 16, 2012 at 12:46 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> After merging the final tree, today's linux-next build (powerpc
> allnoconfig) failed like this:
>
> arch/powerpc/kernel/ptrace.c: In function 'do_syscall_trace_enter':
> arch/powerpc/kernel/ptrace.c:1713:2: error: statement with no effect [-Werror=unused-value]
> cc1: all warnings being treated as errors
>
> Introduced by commit acf3b2c71ed2 ("seccomp: add SECCOMP_RET_ERRNO"). I
> have applied the following hack fix that fixes the build, but the other
> seven call sites of secure_computing() should be fixed up properly.
Thanks for this, and the other two fixes! I'll pull together a patch
fixing up the other call sites. My past revisions had avoided this by
using a new symbol, and I totally forgot to touch these up in the last
round.
What's the best way to submit the clean up -- against the security-next tree?
Thanks and sorry for the noise!
will
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 16 Apr 2012 15:39:49 +1000
> Subject: [PATCH] seccomp: hack fix for build failures with secure_computing
> return value change
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> arch/microblaze/kernel/ptrace.c | 2 +-
> arch/mips/kernel/ptrace.c | 2 +-
> arch/powerpc/kernel/ptrace.c | 2 +-
> arch/s390/kernel/ptrace.c | 2 +-
> arch/sh/kernel/ptrace_32.c | 2 +-
> arch/sh/kernel/ptrace_64.c | 2 +-
> arch/sparc/kernel/ptrace_64.c | 2 +-
> 7 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/arch/microblaze/kernel/ptrace.c b/arch/microblaze/kernel/ptrace.c
> index 6eb2aa9..9e3ffc9 100644
> --- a/arch/microblaze/kernel/ptrace.c
> +++ b/arch/microblaze/kernel/ptrace.c
> @@ -136,7 +136,7 @@ asmlinkage long do_syscall_trace_enter(struct pt_regs *regs)
> {
> long ret = 0;
>
> - secure_computing(regs->r12);
> + (void)secure_computing(regs->r12);
>
> if (test_thread_flag(TIF_SYSCALL_TRACE) &&
> tracehook_report_syscall_entry(regs))
> diff --git a/arch/mips/kernel/ptrace.c b/arch/mips/kernel/ptrace.c
> index 7c24c29..4f83d73 100644
> --- a/arch/mips/kernel/ptrace.c
> +++ b/arch/mips/kernel/ptrace.c
> @@ -535,7 +535,7 @@ static inline int audit_arch(void)
> asmlinkage void syscall_trace_enter(struct pt_regs *regs)
> {
> /* do the secure computing check first */
> - secure_computing(regs->regs[2]);
> + (void)secure_computing(regs->regs[2]);
>
> if (!(current->ptrace & PT_PTRACED))
> goto out;
> diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c
> index 8d8e028..53cebc4 100644
> --- a/arch/powerpc/kernel/ptrace.c
> +++ b/arch/powerpc/kernel/ptrace.c
> @@ -1710,7 +1710,7 @@ long do_syscall_trace_enter(struct pt_regs *regs)
> {
> long ret = 0;
>
> - secure_computing(regs->gpr[0]);
> + (void)secure_computing(regs->gpr[0]);
>
> if (test_thread_flag(TIF_SYSCALL_TRACE) &&
> tracehook_report_syscall_entry(regs))
> diff --git a/arch/s390/kernel/ptrace.c b/arch/s390/kernel/ptrace.c
> index 02f300f..96e0dea 100644
> --- a/arch/s390/kernel/ptrace.c
> +++ b/arch/s390/kernel/ptrace.c
> @@ -719,7 +719,7 @@ asmlinkage long do_syscall_trace_enter(struct pt_regs *regs)
> long ret = 0;
>
> /* Do the secure computing check first. */
> - secure_computing(regs->gprs[2]);
> + (void)secure_computing(regs->gprs[2]);
>
> /*
> * The sysc_tracesys code in entry.S stored the system
> diff --git a/arch/sh/kernel/ptrace_32.c b/arch/sh/kernel/ptrace_32.c
> index 9698671..cf55945 100644
> --- a/arch/sh/kernel/ptrace_32.c
> +++ b/arch/sh/kernel/ptrace_32.c
> @@ -503,7 +503,7 @@ asmlinkage long do_syscall_trace_enter(struct pt_regs *regs)
> {
> long ret = 0;
>
> - secure_computing(regs->regs[0]);
> + (void)secure_computing(regs->regs[0]);
>
> if (test_thread_flag(TIF_SYSCALL_TRACE) &&
> tracehook_report_syscall_entry(regs))
> diff --git a/arch/sh/kernel/ptrace_64.c b/arch/sh/kernel/ptrace_64.c
> index bc81e07..3d3600f 100644
> --- a/arch/sh/kernel/ptrace_64.c
> +++ b/arch/sh/kernel/ptrace_64.c
> @@ -522,7 +522,7 @@ asmlinkage long long do_syscall_trace_enter(struct pt_regs *regs)
> {
> long long ret = 0;
>
> - secure_computing(regs->regs[9]);
> + (void)secure_computing(regs->regs[9]);
>
> if (test_thread_flag(TIF_SYSCALL_TRACE) &&
> tracehook_report_syscall_entry(regs))
> diff --git a/arch/sparc/kernel/ptrace_64.c b/arch/sparc/kernel/ptrace_64.c
> index 6f97c07..6ddec1f 100644
> --- a/arch/sparc/kernel/ptrace_64.c
> +++ b/arch/sparc/kernel/ptrace_64.c
> @@ -1062,7 +1062,7 @@ asmlinkage int syscall_trace_enter(struct pt_regs *regs)
> int ret = 0;
>
> /* do the secure computing check first */
> - secure_computing(regs->u_regs[UREG_G1]);
> + (void)secure_computing(regs->u_regs[UREG_G1]);
>
> if (test_thread_flag(TIF_SYSCALL_TRACE))
> ret = tracehook_report_syscall_entry(regs);
> --
> 1.7.10.rc3
>
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
> http://www.canb.auug.org.au/~sfr/
^ 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