]> git.karo-electronics.de Git - karo-tx-linux.git/log
karo-tx-linux.git
13 years agoMerge remote-tracking branch 'namespace/master'
Stephen Rothwell [Mon, 14 Nov 2011 02:44:16 +0000 (13:44 +1100)]
Merge remote-tracking branch 'namespace/master'

13 years agoMerge remote-tracking branch 'sysctl/master'
Stephen Rothwell [Mon, 14 Nov 2011 02:42:47 +0000 (13:42 +1100)]
Merge remote-tracking branch 'sysctl/master'

13 years agoMerge remote-tracking branch 'percpu/for-next'
Stephen Rothwell [Mon, 14 Nov 2011 02:41:12 +0000 (13:41 +1100)]
Merge remote-tracking branch 'percpu/for-next'

13 years agoMerge remote-tracking branch 'xen/upstream/xen'
Stephen Rothwell [Mon, 14 Nov 2011 02:39:47 +0000 (13:39 +1100)]
Merge remote-tracking branch 'xen/upstream/xen'

Conflicts:
arch/x86/xen/Kconfig

13 years agoMerge remote-tracking branch 'oprofile/for-next'
Stephen Rothwell [Mon, 14 Nov 2011 02:38:16 +0000 (13:38 +1100)]
Merge remote-tracking branch 'oprofile/for-next'

13 years agoMerge remote-tracking branch 'kmemleak/kmemleak'
Stephen Rothwell [Mon, 14 Nov 2011 02:31:48 +0000 (13:31 +1100)]
Merge remote-tracking branch 'kmemleak/kmemleak'

13 years agoMerge remote-tracking branch 'tip/auto-latest'
Stephen Rothwell [Mon, 14 Nov 2011 02:26:05 +0000 (13:26 +1100)]
Merge remote-tracking branch 'tip/auto-latest'

Conflicts:
MAINTAINERS
arch/x86/kernel/cpu/amd.c
drivers/char/random.c

13 years agoMerge remote-tracking branch 'fsnotify/for-next'
Stephen Rothwell [Mon, 14 Nov 2011 02:17:50 +0000 (13:17 +1100)]
Merge remote-tracking branch 'fsnotify/for-next'

13 years agoRevert "freezer: kill unused set_freezable_with_signal()"
Stephen Rothwell [Mon, 14 Nov 2011 02:06:38 +0000 (13:06 +1100)]
Revert "freezer: kill unused set_freezable_with_signal()"

This reverts commit cd3bc8fbc2d55ae0918184fb34992054dc4eb710.

13 years agoMerge remote-tracking branch 'pm/linux-next'
Stephen Rothwell [Mon, 14 Nov 2011 01:29:42 +0000 (12:29 +1100)]
Merge remote-tracking branch 'pm/linux-next'

13 years agoMerge remote-tracking branch 'trivial/for-next'
Stephen Rothwell [Mon, 14 Nov 2011 01:27:10 +0000 (12:27 +1100)]
Merge remote-tracking branch 'trivial/for-next'

13 years agoMerge remote-tracking branch 'osd/linux-next'
Stephen Rothwell [Mon, 14 Nov 2011 01:27:02 +0000 (12:27 +1100)]
Merge remote-tracking branch 'osd/linux-next'

13 years agoMerge remote-tracking branch 'cputime/cputime'
Stephen Rothwell [Mon, 14 Nov 2011 01:20:55 +0000 (12:20 +1100)]
Merge remote-tracking branch 'cputime/cputime'

13 years agoMerge remote-tracking branch 'regulator/for-next'
Stephen Rothwell [Mon, 14 Nov 2011 01:19:19 +0000 (12:19 +1100)]
Merge remote-tracking branch 'regulator/for-next'

13 years agoMerge remote-tracking branch 'fbdev/fbdev-next'
Stephen Rothwell [Mon, 14 Nov 2011 01:17:51 +0000 (12:17 +1100)]
Merge remote-tracking branch 'fbdev/fbdev-next'

13 years agoMerge remote-tracking branch 'md/for-next'
Stephen Rothwell [Mon, 14 Nov 2011 01:16:16 +0000 (12:16 +1100)]
Merge remote-tracking branch 'md/for-next'

13 years agoMerge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Mon, 14 Nov 2011 01:14:52 +0000 (12:14 +1100)]
Merge remote-tracking branch 'slab/for-next'

13 years agoMerge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Mon, 14 Nov 2011 01:14:44 +0000 (12:14 +1100)]
Merge remote-tracking branch 'kgdb/kgdb-next'

13 years agoMerge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Mon, 14 Nov 2011 01:13:17 +0000 (12:13 +1100)]
Merge remote-tracking branch 'mmc/mmc-next'

13 years agoMerge remote-tracking branch 'battery/master'
Stephen Rothwell [Mon, 14 Nov 2011 01:11:52 +0000 (12:11 +1100)]
Merge remote-tracking branch 'battery/master'

13 years agoMerge remote-tracking branch 'block/for-next'
Stephen Rothwell [Mon, 14 Nov 2011 01:09:30 +0000 (12:09 +1100)]
Merge remote-tracking branch 'block/for-next'

13 years agoMerge remote-tracking branch 'input/next'
Stephen Rothwell [Mon, 14 Nov 2011 01:08:02 +0000 (12:08 +1100)]
Merge remote-tracking branch 'input/next'

Conflicts:
drivers/input/keyboard/Kconfig
drivers/input/keyboard/samsung-keypad.c

13 years agoMerge branch 'quilt/rr'
Stephen Rothwell [Mon, 14 Nov 2011 01:06:36 +0000 (12:06 +1100)]
Merge branch 'quilt/rr'

13 years agoMerge remote-tracking branch 'cpufreq/next'
Stephen Rothwell [Mon, 14 Nov 2011 01:06:28 +0000 (12:06 +1100)]
Merge remote-tracking branch 'cpufreq/next'

13 years agoMerge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Mon, 14 Nov 2011 01:05:00 +0000 (12:05 +1100)]
Merge remote-tracking branch 'sound-asoc/for-next'

13 years agoMerge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Mon, 14 Nov 2011 01:03:32 +0000 (12:03 +1100)]
Merge remote-tracking branch 'sound/for-next'

13 years agoMerge remote-tracking branch 'crypto/master'
Stephen Rothwell [Mon, 14 Nov 2011 01:02:03 +0000 (12:02 +1100)]
Merge remote-tracking branch 'crypto/master'

13 years agoMerge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Mon, 14 Nov 2011 01:00:44 +0000 (12:00 +1100)]
Merge remote-tracking branch 'l2-mtd/master'

13 years agoMerge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Mon, 14 Nov 2011 00:59:22 +0000 (11:59 +1100)]
Merge remote-tracking branch 'bluetooth/master'

13 years agoMerge remote-tracking branch 'wireless-next/master'
Stephen Rothwell [Mon, 14 Nov 2011 00:53:44 +0000 (11:53 +1100)]
Merge remote-tracking branch 'wireless-next/master'

Conflicts:
drivers/net/wireless/libertas/cfg.c
include/net/bluetooth/bluetooth.h

13 years agoMerge remote-tracking branch 'net-next/master'
Stephen Rothwell [Mon, 14 Nov 2011 00:36:04 +0000 (11:36 +1100)]
Merge remote-tracking branch 'net-next/master'

13 years agoMerge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Mon, 14 Nov 2011 00:34:43 +0000 (11:34 +1100)]
Merge remote-tracking branch 'slave-dma/next'

Conflicts:
drivers/dma/pl330.c

13 years agoMerge remote-tracking branch 'target-merge/for-next-merge'
Stephen Rothwell [Mon, 14 Nov 2011 00:33:18 +0000 (11:33 +1100)]
Merge remote-tracking branch 'target-merge/for-next-merge'

13 years agoMerge remote-tracking branch 'ibft/master'
Stephen Rothwell [Mon, 14 Nov 2011 00:33:03 +0000 (11:33 +1100)]
Merge remote-tracking branch 'ibft/master'

13 years agoMerge remote-tracking branch 'swiotlb/master'
Stephen Rothwell [Mon, 14 Nov 2011 00:32:59 +0000 (11:32 +1100)]
Merge remote-tracking branch 'swiotlb/master'

Conflicts:
drivers/xen/swiotlb-xen.c

13 years agoMerge remote-tracking branch 'infiniband/for-next'
Stephen Rothwell [Mon, 14 Nov 2011 00:31:19 +0000 (11:31 +1100)]
Merge remote-tracking branch 'infiniband/for-next'

13 years agoMerge remote-tracking branch 'libata/NEXT'
Stephen Rothwell [Mon, 14 Nov 2011 00:29:58 +0000 (11:29 +1100)]
Merge remote-tracking branch 'libata/NEXT'

13 years agoMerge remote-tracking branch 'kconfig/for-next'
Stephen Rothwell [Mon, 14 Nov 2011 00:29:55 +0000 (11:29 +1100)]
Merge remote-tracking branch 'kconfig/for-next'

13 years agoMerge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Mon, 14 Nov 2011 00:29:52 +0000 (11:29 +1100)]
Merge remote-tracking branch 'kbuild/for-next'

13 years agoMerge remote-tracking branch 'v4l-dvb/master'
Stephen Rothwell [Mon, 14 Nov 2011 00:26:36 +0000 (11:26 +1100)]
Merge remote-tracking branch 'v4l-dvb/master'

13 years agoMerge remote-tracking branch 'bjdooks-i2c/next-i2c'
Stephen Rothwell [Mon, 14 Nov 2011 00:25:14 +0000 (11:25 +1100)]
Merge remote-tracking branch 'bjdooks-i2c/next-i2c'

Conflicts:
drivers/i2c/busses/i2c-designware-platdrv.c

13 years agoMerge branch 'quilt/i2c'
Stephen Rothwell [Mon, 14 Nov 2011 00:23:54 +0000 (11:23 +1100)]
Merge branch 'quilt/i2c'

13 years agoMerge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Mon, 14 Nov 2011 00:22:39 +0000 (11:22 +1100)]
Merge remote-tracking branch 'hid/for-next'

13 years agoMerge remote-tracking branch 'pci/linux-next'
Stephen Rothwell [Mon, 14 Nov 2011 00:19:35 +0000 (11:19 +1100)]
Merge remote-tracking branch 'pci/linux-next'

13 years agoMerge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Mon, 14 Nov 2011 00:18:08 +0000 (11:18 +1100)]
Merge remote-tracking branch 'ocfs2/linux-next'

Conflicts:
fs/ocfs2/xattr.c

13 years agoMerge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Mon, 14 Nov 2011 00:16:43 +0000 (11:16 +1100)]
Merge remote-tracking branch 'nfsd/nfsd-next'

13 years agoMerge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Mon, 14 Nov 2011 00:15:24 +0000 (11:15 +1100)]
Merge remote-tracking branch 'nfs/linux-next'

13 years agoMerge remote-tracking branch 'logfs/master'
Stephen Rothwell [Mon, 14 Nov 2011 00:14:07 +0000 (11:14 +1100)]
Merge remote-tracking branch 'logfs/master'

Conflicts:
fs/logfs/file.c

13 years agoMerge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Mon, 14 Nov 2011 00:12:41 +0000 (11:12 +1100)]
Merge remote-tracking branch 'gfs2/master'

13 years agoMerge remote-tracking branch 'cifs/master'
Stephen Rothwell [Mon, 14 Nov 2011 00:11:18 +0000 (11:11 +1100)]
Merge remote-tracking branch 'cifs/master'

13 years agoMerge remote-tracking branch 'xtensa/master'
Stephen Rothwell [Mon, 14 Nov 2011 00:09:58 +0000 (11:09 +1100)]
Merge remote-tracking branch 'xtensa/master'

13 years agoMerge remote-tracking branch 'unicore32/unicore32'
Stephen Rothwell [Mon, 14 Nov 2011 00:08:39 +0000 (11:08 +1100)]
Merge remote-tracking branch 'unicore32/unicore32'

13 years agoMerge remote-tracking branch 's390/features'
Stephen Rothwell [Mon, 14 Nov 2011 00:07:21 +0000 (11:07 +1100)]
Merge remote-tracking branch 's390/features'

13 years agoMerge remote-tracking branch '52xx-and-virtex/powerpc/next'
Stephen Rothwell [Mon, 14 Nov 2011 00:07:04 +0000 (11:07 +1100)]
Merge remote-tracking branch '52xx-and-virtex/powerpc/next'

13 years agoMerge remote-tracking branch 'parisc/for-next'
Stephen Rothwell [Mon, 14 Nov 2011 00:05:44 +0000 (11:05 +1100)]
Merge remote-tracking branch 'parisc/for-next'

13 years agoMerge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Mon, 14 Nov 2011 00:04:21 +0000 (11:04 +1100)]
Merge remote-tracking branch 'mips/mips-for-linux-next'

13 years agoMerge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Mon, 14 Nov 2011 00:03:03 +0000 (11:03 +1100)]
Merge remote-tracking branch 'm68knommu/for-next'

Conflicts:
arch/m68k/Kconfig
arch/m68k/Kconfig.debug
arch/m68k/kernel/Makefile

13 years agoMerge remote-tracking branch 'm68k/for-next'
Stephen Rothwell [Sun, 13 Nov 2011 23:53:37 +0000 (10:53 +1100)]
Merge remote-tracking branch 'm68k/for-next'

13 years agoMerge remote-tracking branch 'ia64/next'
Stephen Rothwell [Sun, 13 Nov 2011 23:53:31 +0000 (10:53 +1100)]
Merge remote-tracking branch 'ia64/next'

13 years agoMerge remote-tracking branch 'cris/for-next'
Stephen Rothwell [Sun, 13 Nov 2011 23:51:58 +0000 (10:51 +1100)]
Merge remote-tracking branch 'cris/for-next'

13 years agoMerge remote-tracking branch 'c6x/for-linux-next'
Stephen Rothwell [Sun, 13 Nov 2011 23:46:44 +0000 (10:46 +1100)]
Merge remote-tracking branch 'c6x/for-linux-next'

13 years agoMerge remote-tracking branch 'tegra/for-next'
Stephen Rothwell [Sun, 13 Nov 2011 23:45:18 +0000 (10:45 +1100)]
Merge remote-tracking branch 'tegra/for-next'

13 years agoMerge remote-tracking branch 's5p/for-next'
Stephen Rothwell [Sun, 13 Nov 2011 23:44:06 +0000 (10:44 +1100)]
Merge remote-tracking branch 's5p/for-next'

13 years agoMerge remote-tracking branch 'i.MX/for-next'
Stephen Rothwell [Sun, 13 Nov 2011 23:42:42 +0000 (10:42 +1100)]
Merge remote-tracking branch 'i.MX/for-next'

Conflicts:
arch/arm/mach-mx5/clock-mx51-mx53.c
arch/arm/mach-mx5/devices-imx53.h
arch/arm/mach-mx5/mm.c
arch/arm/plat-mxc/include/mach/hardware.h

13 years agoMerge remote-tracking branch 'at91/at91-next'
Stephen Rothwell [Sun, 13 Nov 2011 23:41:14 +0000 (10:41 +1100)]
Merge remote-tracking branch 'at91/at91-next'

Conflicts:
arch/arm/mach-at91/at91sam9260.c
arch/arm/mach-at91/at91sam9g45.c
arch/arm/mach-at91/board-afeb-9260v1.c
arch/arm/mach-at91/board-neocore926.c
arch/arm/mach-at91/board-rm9200dk.c
arch/arm/mach-at91/board-sam9g20ek.c
arch/arm/mach-at91/board-sam9m10g45ek.c
drivers/ata/pata_at91.c

13 years agoMerge remote-tracking branch 'arm-lpae/for-next'
Stephen Rothwell [Sun, 13 Nov 2011 23:39:49 +0000 (10:39 +1100)]
Merge remote-tracking branch 'arm-lpae/for-next'

Conflicts:
arch/arm/include/asm/pgalloc.h
arch/arm/include/asm/pgtable.h
arch/arm/include/asm/tlb.h

13 years agoMerge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Sun, 13 Nov 2011 23:36:13 +0000 (10:36 +1100)]
Merge remote-tracking branch 'arm/for-next'

13 years agoMerge remote-tracking branch 'ide/master'
Stephen Rothwell [Sun, 13 Nov 2011 23:32:52 +0000 (10:32 +1100)]
Merge remote-tracking branch 'ide/master'

13 years agoMerge remote-tracking branch 'input-current/for-linus'
Stephen Rothwell [Sun, 13 Nov 2011 23:32:40 +0000 (10:32 +1100)]
Merge remote-tracking branch 'input-current/for-linus'

13 years agoMerge remote-tracking branch 'wireless/master'
Stephen Rothwell [Sun, 13 Nov 2011 23:32:37 +0000 (10:32 +1100)]
Merge remote-tracking branch 'wireless/master'

13 years agoMerge remote-tracking branch 'pci-current/for-linus'
Stephen Rothwell [Sun, 13 Nov 2011 23:32:35 +0000 (10:32 +1100)]
Merge remote-tracking branch 'pci-current/for-linus'

13 years agoMerge remote-tracking branch 'net/master'
Stephen Rothwell [Sun, 13 Nov 2011 23:32:34 +0000 (10:32 +1100)]
Merge remote-tracking branch 'net/master'

13 years agoMerge remote-tracking branch 'scsi-rc-fixes/master'
Stephen Rothwell [Sun, 13 Nov 2011 23:32:33 +0000 (10:32 +1100)]
Merge remote-tracking branch 'scsi-rc-fixes/master'

13 years agoMerge remote-tracking branch 'arm-current/fixes'
Stephen Rothwell [Sun, 13 Nov 2011 23:32:30 +0000 (10:32 +1100)]
Merge remote-tracking branch 'arm-current/fixes'

13 years agonet: introduce ethernet teaming device
Jiri Pirko [Fri, 11 Nov 2011 22:16:48 +0000 (22:16 +0000)]
net: introduce ethernet teaming device

This patch introduces new network device called team. It supposes to be
very fast, simple, userspace-driven alternative to existing bonding
driver.

Userspace library called libteam with couple of demo apps is available
here:
https://github.com/jpirko/libteam
Note it's still in its dipers atm.

team<->libteam use generic netlink for communication. That and rtnl
suppose to be the only way to configure team device, no sysfs etc.

Python binding of libteam was recently introduced.
Daemon providing arpmon/miimon active-backup functionality will be
introduced shortly. All what's necessary is already implemented in
kernel team driver.

v7->v8:
- check ndo_ndo_vlan_rx_[add/kill]_vid functions before calling
  them.
- use dev_kfree_skb_any() instead of dev_kfree_skb()

v6->v7:
- transmit and receive functions are not checked in hot paths.
  That also resolves memory leak on transmit when no port is
  present

v5->v6:
- changed couple of _rcu calls to non _rcu ones in non-readers

v4->v5:
- team_change_mtu() uses team->lock while travesing though port
  list
- mac address changes are moved completely to jurisdiction of
  userspace daemon. This way the daemon can do FOM1, FOM2 and
  possibly other weird things with mac addresses.
  Only round-robin mode sets up all ports to bond's address then
  enslaved.
- Extended Kconfig text

v3->v4:
- remove redundant synchronize_rcu from __team_change_mode()
- revert "set and clear of mode_ops happens per pointer, not per
  byte"
- extend comment of function __team_change_mode()

v2->v3:
- team_change_mtu() uses rcu version of list traversal to unwind
- set and clear of mode_ops happens per pointer, not per byte
- port hashlist changed to be embedded into team structure
- error branch in team_port_enter() does cleanup now
- fixed rtln->rtnl

v1->v2:
- modes are made as modules. Makes team more modular and
  extendable.
- several commenters' nitpicks found on v1 were fixed
- several other bugs were fixed.
- note I ignored Eric's comment about roundrobin port selector
  as Eric's way may be easily implemented as another mode (mode
  "random") in future.

Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
13 years agobnx2x: update driver version to 1.70.35-0
Dmitry Kravkov [Sun, 13 Nov 2011 04:34:32 +0000 (04:34 +0000)]
bnx2x: update driver version to 1.70.35-0

Signed-off-by: Dmitry Kravkov <dmitry@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
13 years agobnx2x: Remove on-stack napi struct variable
Ariel Elior [Sun, 13 Nov 2011 04:34:31 +0000 (04:34 +0000)]
bnx2x: Remove on-stack napi struct variable

Signed-off-by: Ariel Elior <ariele@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
13 years agobnx2x: prevent race in statistics flow
Dmitry Kravkov [Sun, 13 Nov 2011 04:34:30 +0000 (04:34 +0000)]
bnx2x: prevent race in statistics flow

The race may cause access of registers while MAC hw block is
in reset state. As a result syslog will show error messages.
We can prevent this by using state from local variable.

Signed-off-by: Dmitry Kravkov <dmitry@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
13 years agobnx2x: add fan failure event handling
Ariel Elior [Sun, 13 Nov 2011 04:34:29 +0000 (04:34 +0000)]
bnx2x: add fan failure event handling

Shut down the device in case of fan failure to prevent HW damage.

Signed-off-by: Dmitry Kravkov <dmitry@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
13 years agobnx2x: remove unused #define
Dmitry Kravkov [Sun, 13 Nov 2011 04:34:28 +0000 (04:34 +0000)]
bnx2x: remove unused #define

Signed-off-by: Dmitry Kravkov <dmitry@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
13 years agobnx2x: simplify definition of RX_SGE_MASK_LEN and use it.
Dmitry Kravkov [Sun, 13 Nov 2011 04:34:27 +0000 (04:34 +0000)]
bnx2x: simplify definition of RX_SGE_MASK_LEN and use it.

Signed-off-by: Dmitry Kravkov <dmitry@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
13 years agobnx2x: DCBX: use #define instead of magic
Dmitry Kravkov [Sun, 13 Nov 2011 04:34:26 +0000 (04:34 +0000)]
bnx2x: DCBX: use #define instead of magic

Signed-off-by: Dmitry Kravkov <dmitry@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
13 years agobnx2x: propagate DCBX negotiation
Dmitry Kravkov [Sun, 13 Nov 2011 04:34:25 +0000 (04:34 +0000)]
bnx2x: propagate DCBX negotiation

We need propagate the DCBX results from PMF to other functions
on the same port, in order to properly update netdev structure
and allow following new ETS and PFC configurations.

Signed-off-by: Dmitry Kravkov <dmitry@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
13 years agobnx2x: separate FCoE and iSCSI license initialization.
Dmitry Kravkov [Sun, 13 Nov 2011 04:34:24 +0000 (04:34 +0000)]
bnx2x: separate FCoE and iSCSI license initialization.

FCoE license info must be initialized at probe(), but
iSCSI at open().

Signed-off-by: Dmitry Kravkov <dmitry@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
13 years agobnx2x: remove unused variable
Dmitry Kravkov [Sun, 13 Nov 2011 04:34:23 +0000 (04:34 +0000)]
bnx2x: remove unused variable

Signed-off-by: Dmitry Kravkov <dmitry@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
13 years agobnx2x: use rx_queue index for skb_record_rx_queue()
Dmitry Kravkov [Sun, 13 Nov 2011 04:34:22 +0000 (04:34 +0000)]
bnx2x: use rx_queue index for skb_record_rx_queue()

Signed-off-by: Dmitry Kravkov <dmitry@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
13 years agobnx2x: allow FCoE and DCB for 578xx
Dmitry Kravkov [Sun, 13 Nov 2011 04:34:21 +0000 (04:34 +0000)]
bnx2x: allow FCoE and DCB for 578xx

Signed-off-by: Dmitry Kravkov <dmitry@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
13 years agoMAINTAINERS: update ipwireless entry
Jiri Kosina [Sun, 13 Nov 2011 20:41:00 +0000 (21:41 +0100)]
MAINTAINERS: update ipwireless entry

Drop the git tree from MAINTAINERS for ipwireless_cs, as there
is no active development on this driver happening. Also change
the driver from Maintained to Odd Fixes for the same reason.

Cc: David Sterba <dsterba@suse.cz>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
13 years agoMerge branch 'wacom' into for-next
Jiri Kosina [Sun, 13 Nov 2011 20:33:27 +0000 (21:33 +0100)]
Merge branch 'wacom' into for-next

13 years agoHID: wacom: Initial driver for Wacom Intuos4 Wireless (Bluetooth)
Przemo Firszt [Sat, 5 Nov 2011 11:28:22 +0000 (11:28 +0000)]
HID: wacom: Initial driver for Wacom Intuos4 Wireless (Bluetooth)

This is very basic driver for Wacom Intuos4 Wireless tablet. It supports only
position, pressure and pen buttons. More features will be added in the future.

Signed-off-by: Przemo Firszt <przemo@firszt.eu>
Acked-by: Ping Cheng <pinglinux@gmail.com>
Reviewed-by: Chris Bagwell <chris@cnpbagwell.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
13 years agoHID: wacom: Move parsing to a separate function
Przemo Firszt [Sat, 5 Nov 2011 11:28:21 +0000 (11:28 +0000)]
HID: wacom: Move parsing to a separate function

This patch doesn't change the way driver works. Parsing logic is now in a
separate function. It's a first step to add Intuos4 Wireless support to
hid-wacom driver.

Signed-off-by: Przemo Firszt <przemo@firszt.eu>
Acked-by: Ping Cheng <pinglinux@gmail.com>
Reviewed-by: Chris Bagwell <chris@cnpbagwell.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
13 years agoMIPS: Sibyte: drop select of SIBYTE_CFE
Paul Bolle [Sun, 13 Nov 2011 20:23:35 +0000 (21:23 +0100)]
MIPS: Sibyte: drop select of SIBYTE_CFE

SIBYTE_CFE got killed in commit 05f94eebd5 ("MIPS: Sibyte: Remove
standalone kernel support"). This means that since v2.6.31 there is no
Kconfig symbol SIBYTE_CFE. The select statement for that symbol is a
nop. Drop it.

Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
13 years agodrop "select GCD" from three Kconfig files
Paul Bolle [Sat, 12 Nov 2011 21:47:36 +0000 (22:47 +0100)]
drop "select GCD" from three Kconfig files

There is no Kconfig symbol named GCD. The three select statements for
that symbol are nops. Drop these.

Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
13 years agopowerpc/mpc5121: drop "select MPC5121_ADS_CPLD"
Paul Bolle [Sun, 13 Nov 2011 18:26:53 +0000 (19:26 +0100)]
powerpc/mpc5121: drop "select MPC5121_ADS_CPLD"

There is no Kconfig symbol named MPC5121_ADS_CPLD. The select statement
for that symbol is a nop. Drop it.

Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
13 years agomtd: drop select of MTD_PARTITIONS
Paul Bolle [Wed, 9 Nov 2011 00:20:52 +0000 (01:20 +0100)]
mtd: drop select of MTD_PARTITIONS

MTD_PARTITIONS got killed in commit 6a8a98b22b. This means that since
v3.0 this Kconfig symbol doesn't exist anymore. Apparently selecting
a non-existant symbol is a nop. Drop that select.

Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
13 years agoMerge branch 'master' into for-next
Jiri Kosina [Sun, 13 Nov 2011 19:55:35 +0000 (20:55 +0100)]
Merge branch 'master' into for-next

Sync with Linus tree to have 157550ff ("mtd: add GPMI-NAND driver
in the config and Makefile") as I have patch depending on that one.

13 years agocrypto: drop selects of bogus Kconfig symbol
Paul Bolle [Sat, 12 Nov 2011 20:27:55 +0000 (21:27 +0100)]
crypto: drop selects of bogus Kconfig symbol

Commits 2cdc6899a8 ("crypto: ghash - Add GHASH digest algorithm for
GCM") and 0e1227d356 ("crypto: ghash - Add PCLMULQDQ accelerated
implementation") added "select CRYPTO_SHASH" to two entries. That
Kconfig symbol doesn't exist. These two selects are nops. Drop them.

Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
13 years agos390: drop "select HAVE_GET_USER_PAGES_FAST"
Paul Bolle [Sun, 13 Nov 2011 12:00:56 +0000 (13:00 +0100)]
s390: drop "select HAVE_GET_USER_PAGES_FAST"

There is no Kconfig symbol named HAVE_GET_USER_PAGES_FAST. The select
statement for that symbol is a nop. Drop it.

Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
13 years agopowerpc/4xx: Fix typo 'PCC4xx_MSI'
Paul Bolle [Sun, 13 Nov 2011 00:22:40 +0000 (01:22 +0100)]
powerpc/4xx: Fix typo 'PCC4xx_MSI'

Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Acked-by: Josh Boyer <jwboyer@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
13 years agoMerge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Linus Torvalds [Sun, 13 Nov 2011 19:09:55 +0000 (17:09 -0200)]
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/radeon/kms/combios: fix dynamic allocation of PM clock modes