Linus Torvalds
203738e548
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...
1) ICMP sockets leave err uninitialized but we try to return it for the
unsupported MSG_OOB case, reported by Dave Jones.
2) Add new Zaurus device ID entries, from Dave Jones.
3) Pointer calculation in hso driver memset is wrong, from Dan
Carpenter.
4) ks8851_probe() checks unsigned value as negative, fix also from Dan
Carpenter.
5) Fix crashes in atl1c driver due to TX queue handling, from Eric
Dumazet. I anticipate some TX side locking fixes coming in the near
future for this driver as well.
6) The inline directive fix in Bluetooth which was breaking the build
only with very new versions of GCC, from Johan Hedberg.
7) Fix crashes in the ATP CLIP code due to ARP cleanups this merge
window, reported by Meelis Roos and fixed by Eric Dumazet.
8) JME driver doesn't flush RX FIFO correctly, from Guo-Fu Tseng.
9) Some ip6_route_output() callers test the return value for NULL, but
this never happens as the convention is to return a dst entry with
dst->error set. Fixes from RonQing Li.
10) Logitech Harmony 900 should be handled by zaurus driver not
cdc_ether, update white lists and black lists accordingly. From
Scott Talbert.
11) Receiving from certain kinds of devices there won't be a MAC header,
so there is no MAC header to fixup in the IPSEC code, and if we try
to do it we'll crash. Fix from Eric Dumazet.
12) Port type array indexing off-by-one in mlx4 driver, fix from Yevgeny
Petrilin.
13) Fix regression in link-down handling in davinci_emac which causes
all RX descriptors to be freed up and therefore RX to wedge
completely, from Christian Riesch.
14) It took two attempts, but ctnetlink soft lockups seem to be
cured now, from Pablo Neira Ayuso.
15) Endianness bug fix in ENIC driver, from Santosh Nayak.
16) The long ago conversion of the PPP fragmentation code over to
abstracted SKB list handling wasn't perfect, once we get an
out of sequence SKB we don't flush the rest of them like we
should. From Ben McKeegan.
17) Fix regression of ->ip_summed initialization in sfc driver.
From Ben Hutchings.
18) Bluetooth timeout mistakenly using msecs instead of jiffies,
from Andrzej Kaczmarek.
19) Using _sync variant of work cancellation results in deadlocks,
use the non _sync variants instead. From Andre Guedes.
20) Bluetooth rfcomm code had reference counting problems leading
to crashes, fix from Octavian Purdila.
21) The conversion of netem over to classful qdisc handling added
two bugs to netem_dequeue(), fixes from Eric Dumazet.
22) Missing pci_iounmap() in ATM Solos driver. Fix from Julia Lawall.
23) b44_pci_exit() should not have __exit tag since it's invoked from
non-__exit code. From Nikola Pajkovsky.
24) The conversion of the neighbour hash tables over to RCU added a
race, fixed here by adding the necessary reread of tbl->nht, fix
from Michel Machado.
25) When we added VF (virtual function) attributes for network device
dumps, this potentially bloats up the size of the dump of one
network device such that the dump size is too large for the buffer
allocated by properly written netlink applications.
In particular, if you add 255 VFs to a network device, parts of
GLIBC stop working.
To fix this, we add an attribute that is used to turn on these
extended portions of the network device dump. Sophisticaed
applications like 'ip' that want to see this stuff will be changed
to set the attribute, whereas things like GLIBC that don't care
about VFs simply will not, and therefore won't be busted by the
mere presence of VFs on a network device.
Thanks to the tireless work of Greg Rose on this fix.
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (53 commits)
sfc: Fix assignment of ip_summed for pre-allocated skbs
ppp: fix 'ppp_mp_reconstruct bad seq' errors
enic: Fix endianness bug.
gre: fix spelling in comments
netfilter: ctnetlink: fix soft lockup when netlink adds new entries (v2)
Revert "netfilter: ctnetlink: fix soft lockup when netlink adds new entries"
davinci_emac: Do not free all rx dma descriptors during init
mlx4_core: Fixing array indexes when setting port types
phy: IC+101G and PHY_HAS_INTERRUPT flag
netdev/phy/icplus: Correct broken phy_init code
ipsec: be careful of non existing mac headers
Move Logitech Harmony 900 from cdc_ether to zaurus
hso: memsetting wrong data in hso_get_count()
netfilter: ip6_route_output() never returns NULL.
ethernet/broadcom: ip6_route_output() never returns NULL.
ipv6: ip6_route_output() never returns NULL.
jme: Fix FIFO flush issue
atm: clip: remove clip_tbl
ipv4: ping: Fix recvmsg MSG_OOB error handling.
rtnetlink: Fix problem with buffer allocation
...
2012-02-26 12:47:17 -08:00
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2012-01-17 18:40:24 -08:00
bcma: connect the bcma bus suspend/resume to the bcma driver suspend/resume
2012-01-17 09:54:08 -05:00
[media] dvb: deprecate the usage of ops->info.type
2012-01-04 17:30:20 -02:00
mfd: Add power off functionality to TWL
2012-01-09 00:37:40 +01:00
Input: add driver for pixcir i2c touchscreens
2011-12-30 15:25:52 -08:00
module_param: make bool parameters really bool (drivers & misc)
2012-01-13 09:32:20 +10:30
mfd: Store twl6040-codec mclk configuration
2012-02-03 19:03:44 +01:00
mlx4_en: eth statistics modification
2012-01-22 15:08:43 -05:00
mmc: dw_mmc: Fix PIO mode with support of highmem
2012-02-13 20:39:05 -05:00
- Fix a regression in 16-bit Atmel NAND flash which was introduced in 3.1
2012-02-04 07:17:47 -08:00
netfilter: revert user-space expectation helper support
2012-01-16 14:01:23 +01:00
netfilter: ebtables: fix alignment problem in ppc
2012-02-21 13:29:06 +01:00
netfilter: xtables: give xt_ecn its own name
2011-12-27 20:31:38 +01:00
pinctrl: remove unnecessary max pin number
2012-01-03 09:10:09 +01:00
Cleanups on various subarchitectures
2012-01-09 14:21:03 -08:00
sbs-battery: Rename internals to new name
2012-01-06 05:22:21 +04:00
md: create externally visible flags for supporting hot-replace.
2011-12-23 10:17:51 +11:00
regulator: add regulator_bulk_force_disable function
2012-01-03 20:20:01 +00:00
ssb: extract FEM info from SPROM
2011-12-13 15:30:49 -05:00
Merge branch 'for-3.3' of git://linux-nfs.org/~bfields/linux
2012-01-14 12:26:41 -08:00
USB: Remove duplicate USB 3.0 hub feature #defines.
2012-02-10 14:24:31 -08:00
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2012-01-18 15:51:48 -08:00
ACPI: Export interfaces for ioremapping/iounmapping ACPI registers
2012-01-17 04:35:20 -05:00
ahci: platform support for suspend/resume
2012-01-08 19:14:59 -05:00
iommu/amd: Add invalidate-context call-back
2011-12-15 11:15:39 +01:00
ARM: Orion: Remove address map info from all platform data structures
2011-12-13 18:46:56 -05:00
audit: comparison on interprocess fields
2012-01-17 16:17:03 -05:00
exec: fix use-after-free bug in setup_new_exec()
2012-02-06 15:15:20 -08:00
block: Stop using macro stubs for the bio data integrity calls
2012-01-13 08:15:33 +01:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
2012-02-18 15:24:05 -08:00
block: strip out locking optimization in put_io_context()
2012-02-07 07:51:30 +01:00
Merge branch 'for-linus' of git://selinuxproject.org/~jmorris/linux-security
2012-01-14 18:36:33 -08:00
cdrom: move shared static to cdrom_device_info
2012-02-08 20:03:14 +01:00
Merge branch 'for-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
2012-01-09 12:59:24 -08:00
clk: add helper functions clk_prepare_enable and clk_disable_unprepare
2011-12-28 21:25:35 +08:00
time/clocksource: Fix kernel-doc warnings
2011-12-19 11:41:40 +01:00
Fix autofs compile without CONFIG_COMPAT
2012-02-26 09:44:55 -08:00
ftrace: Do not function trace inlined functions
2011-12-21 07:14:34 -05:00
kernel.h: add BUILD_BUG() macro
2012-01-10 16:30:42 -08:00
kernel.h: add BUILD_BUG() macro
2012-01-10 16:30:42 -08:00
configfs: convert to umode_t
2012-01-03 22:54:57 -05:00
module_param: make bool parameters really bool (drivers & misc)
2012-01-13 09:32:20 +10:30
Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
2012-01-07 12:03:30 -08:00
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2012-01-18 15:51:48 -08:00
include/linux/crash_dump.h needs elf.h
2012-01-12 20:13:11 -08:00
capabilities: remove task_ns_* functions
2012-01-05 18:52:59 -05:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
2012-01-13 10:29:21 -08:00
Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2012-01-08 12:19:57 -08:00
kernel-doc: fix new warnings in device.h
2012-01-24 10:47:41 -08:00
digsig: changed type of the timestamp
2012-02-20 19:46:36 +11:00
dlm: add recovery callbacks
2012-01-04 08:56:31 -06:00
dma-buf: Introduce dma buffer sharing mechanism
2012-01-06 10:20:21 +00:00
iommu: Export intel_iommu_enabled to signal when iommu is in use
2011-12-16 08:49:57 -08:00
dmaengine: add DMA_TRANS_NONE to dma_transfer_direction
2011-12-23 21:33:15 +05:30
edac: convert sysdev_class to a regular subsystem
2011-12-14 15:21:07 -08:00
block: don't call elevator callbacks for plug merges
2012-02-08 09:19:42 +01:00
ethtool: Remove ethtool_ops::set_rx_ntuple operation
2012-01-04 14:10:28 -05:00
epoll: limit paths
2012-01-12 20:13:04 -08:00
ext3: propagate umode_t
2012-01-03 22:54:58 -05:00
fbdev: Add FOURCC-based format configuration API
2011-12-19 20:07:13 +00:00
PM / Hibernate: Fix s2disk regression related to freezing workqueues
2012-01-29 20:35:52 +01:00
vfs: Provide function to get superblock and wait for it to thaw
2012-02-13 20:45:38 -05:00
tracing: Fix compile error when static ftrace is enabled
2012-01-07 17:26:49 -05:00
switch device_get_devnode() and ->devnode() to umode_t *
2012-01-03 22:54:55 -05:00
mm: try to distribute dirty pages fairly across zones
2012-01-10 16:30:43 -08:00
GFS2: dlm based recovery coordination
2012-01-11 09:23:05 +00:00
Input: gpio_keys - fix struct device declared inside parameter list
2012-02-01 09:13:11 -08:00
Merge branch 'hid-battery' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen into for-linus
2012-01-09 11:24:59 +01:00
thp: add tlb_remove_pmd_tlb_entry
2012-01-12 20:13:08 -08:00
net/hyperv: Fix the page buffer when an RNDIS message goes beyond page boundary
2012-02-02 14:35:12 -05:00
Merge branch 'driver-core-next' into Linux 3.2
2012-01-06 11:42:52 -08:00
switch procfs to umode_t use
2012-01-03 22:54:56 -05:00
ieee80211: Introduce ieee80211_is_first_frag
2011-12-13 15:30:40 -05:00
rtnetlink: Fix problem with buffer allocation
2012-02-21 16:56:45 -05:00
team: send only changed options/ports via netlink
2012-01-24 15:51:00 -05:00
inet_diag: Rename inet_diag_req_compat into inet_diag_req
2012-01-11 12:56:06 -08:00
module_param: make bool parameters really bool (core code)
2012-01-13 09:32:18 +10:30
Merge branch 'for-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
2012-01-09 12:59:24 -08:00
block: strip out locking optimization in put_io_context()
2012-02-07 07:51:30 +01:00
Merge branches 'iommu/page-sizes' and 'iommu/group-id' into next
2012-01-09 13:06:28 +01:00
switch kern_ipc_perm to umode_t
2012-01-03 22:55:17 -05:00
ARM: 7235/1: irqdomain: export irq_domain_simple_ops for !CONFIG_OF
2011-12-23 22:33:58 +00:00
switch ->is_visible() to returning umode_t
2012-01-03 22:54:55 -05:00
jbd: Remove j_barrier mutex
2012-01-09 13:52:09 +01:00
jbd2: clear revoked flag on buffers before a new transaction started
2011-12-28 17:46:46 -05:00
unix_diag: Include unix_diag.h into header-y target
2011-12-30 16:42:19 -05:00
treewide: convert uses of ATTRIB_NORETURN to __noreturn
2012-01-12 20:13:03 -08:00
kdump: define KEXEC_NOTE_BYTES arch specific for s390x
2012-01-23 08:38:48 -08:00
KEYS: Permit key_serial() to be called with a const key pointer
2012-01-19 16:17:35 +11:00
kexec: remove KMSG_DUMP_KEXEC
2012-01-12 20:13:11 -08:00
kobject: remove kset_find_obj_hinted()
2011-12-21 15:13:54 -08:00
Fix compile breakage with kref.h
2012-01-17 15:40:51 -08:00
KVM: Don't automatically expose the TSC deadline timer in cpuid
2011-12-26 13:27:44 +02:00
KVM: Expose a version 2 architectural PMU to a guests
2011-12-27 11:24:29 +02:00
KVM: Fix whitespace in kvm_para.h
2011-12-27 11:26:41 +02:00
leds: add driver for TCA6507 LED controller
2012-01-10 16:30:49 -08:00
VFS: Fix race between CPU hotplug and lglocks
2011-12-22 02:02:20 -05:00
include/linux/linkage.h: remove unused ATTRIB_NORET macro
2012-01-12 20:13:03 -08:00
include/linux/lp8727.h: Remove executable bit
2012-02-02 15:43:40 -08:00
ARM: Orion: Get address map from plat-orion instead of via platform_data
2011-12-13 18:46:55 -05:00
memcg: clear pc->mem_cgroup if necessary.
2012-01-12 20:13:07 -08:00
convert 'memory' sysdev_class to a regular subsystem
2011-12-21 14:48:43 -08:00
mm/mempolicy.c: mpol_equal(): use bool
2012-01-10 16:30:45 -08:00
mm: fix warnings regarding enum migrate_mode
2012-01-23 08:38:47 -08:00
mm: fix warnings regarding enum migrate_mode
2012-01-23 08:38:47 -08:00
vhost-net: add module alias (v2.1)
2012-01-13 10:12:23 -08:00
Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-01-11 19:12:10 -08:00
mm: remove del_page_from_lru, add page_off_lru
2012-01-12 20:13:10 -08:00
mm,slub,x86: decouple size of struct page from CONFIG_CMPXCHG_LOCAL
2012-01-12 20:13:03 -08:00
mm: enum lru_list lru
2012-01-12 20:13:10 -08:00
vfs: take /proc/*/mounts and friends to fs/proc_namespace.c
2012-01-03 22:57:13 -05:00
Revert "ARM: sa11x0: Implement autoloading of codec and codec pdata for mcp bus."
2012-01-20 17:38:58 +00:00
module: struct module_ref should contains long fields
2012-01-13 09:32:14 +10:30
module_param: check that bool parameters really are bool.
2012-01-13 09:32:28 +10:30
vfs: move fsnotify junk to struct mount
2012-01-03 22:57:12 -05:00
lib/mpi: replaced MPI_NULL with normal NULL
2012-02-02 00:23:14 +11:00
PCI/sysfs: add per pci device msi[x] irq listing (v5)
2012-01-06 12:10:25 -08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-01-09 14:46:52 -08:00
NFC: Export a new attribute nfcid1 in target info
2012-01-04 14:30:43 -05:00
pull manipulations of rpc_cred inside alloc_nfs_open_context()
2012-01-03 22:52:34 -05:00
NFS: Cache state owners after files are closed
2012-01-05 11:59:18 -05:00
NFSv4: Save the owner/group name string when doing open
2012-01-07 13:22:46 -05:00
NFSv4: Fix an Oops in the NFSv4 getacl code
2012-02-03 18:50:34 -05:00
cfg80211: Return beacon loss count in station
2011-12-19 14:34:13 -05:00
convert 'memory' sysdev_class to a regular subsystem
2011-12-21 14:48:43 -08:00
devicetree/next changes queued for v3.3 merge window
2012-01-07 12:18:52 -08:00
ARM/of: allow *machine_desc.dt_compat to be const
2011-12-27 10:57:13 -06:00
mm: unify remaining mem_cont, mem, etc. variable names to memcg
2012-01-12 20:13:06 -08:00
mm: more intensive memory corruption debugging
2012-01-10 16:30:42 -08:00
memcg: simplify LRU handling by new rule
2012-01-12 20:13:07 -08:00
mm: fewer underscores in ____pagevec_lru_add
2012-01-12 20:13:10 -08:00
PCI: Rework ASPM disable code
2012-01-06 12:10:26 -08:00
PCI: Increase resource array mask bit size in pcim_iomap_regions()
2012-01-06 12:15:21 -08:00
PCI: pci_ids: add device ids for STA2X11 device (aka ConneXT)
2012-01-06 12:11:40 -08:00
Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci
2012-01-11 18:50:26 -08:00
percpu: Remove irqsafe_cpu_xxx variants
2011-12-22 10:40:20 -08:00
perf: Fix broken interrupt rate throttling
2012-01-27 12:06:39 +01:00
phylib: introduce mdiobus_alloc_size()
2012-01-12 15:23:04 -08:00
procfs: add hidepid= and gid= mount options
2012-01-10 16:30:54 -08:00
net_sched: sfq: add optional RED on top of SFQ
2012-01-12 20:05:28 -08:00
Merge branch 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
2012-01-08 13:10:57 -08:00
Merge branch 'pm-runtime' into pm-for-linus
2011-12-25 23:43:05 +01:00
PM / QoS: CPU C-state breakage with PM Qos change
2012-02-04 22:23:17 +01:00
Merge branch 'power-supply-scope' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen
2012-01-04 09:09:35 +04:00
c/r: prctl: add PR_SET_MM codes to set up mm_struct entries
2012-01-12 20:13:13 -08:00
procfs: make proc_get_link to use dentry instead of inode
2012-01-10 16:30:54 -08:00
lib: proportion: lower PROP_MAX_SHIFT to 32 on 64-bit kernel
2012-02-01 16:53:46 +08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit
2012-01-17 16:41:31 -08:00
quota: Pass information that quota is stored in system file to userspace
2012-01-12 13:09:09 +01:00
radix_tree: remove radix_tree_indirect_to_ptr()
2012-01-12 20:13:12 -08:00
pohmelfs: propagate umode_t
2012-01-03 22:55:07 -05:00
reiserfs: Properly display mount options in /proc/mounts
2012-01-06 23:20:13 -05:00
reiserfs: Properly display mount options in /proc/mounts
2012-01-06 23:20:13 -05:00
switch debugfs to umode_t
2012-01-03 22:54:56 -05:00
net: introduce res_counter_charge_nofail() for socket allocations
2012-01-22 15:08:46 -05:00
mm: unify remaining mem_cont, mem, etc. variable names to memcg
2012-01-12 20:13:06 -08:00
rtnetlink: Fix problem with buffer allocation
2012-02-21 16:56:45 -05:00
s3c_adc_battery: Average over more than one adc sample
2012-01-06 06:13:35 +04:00
Fix race in process_vm_rw_core
2012-02-02 12:55:17 -08:00
Merge branch 'for-linus' of git://selinuxproject.org/~jmorris/linux-security
2012-01-14 18:36:33 -08:00
constify seq_file stuff
2012-01-03 22:52:40 -05:00
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2012-01-14 13:05:21 -08:00
dma: sh_dma: not all SH DMAC implementations support MEMCPY
2012-02-01 22:23:53 +05:30
PM / shmobile: Don't include SH7372's INTCS in syscore suspend/resume
2011-12-25 23:39:11 +01:00
sh: pfc: Unlock register support
2012-01-09 09:33:57 +09:00
SHM_UNLOCK: fix Unevictable pages stranded after swap
2012-01-23 08:38:48 -08:00
signal: add block_sigmask() for adding sigmask to current->blocked
2012-01-10 16:30:54 -08:00
epoll: introduce POLLFREE to flush ->signalfd_wqh before kfree()
2012-02-24 11:42:50 -08:00
ipsec: be careful of non existing mac headers
2012-02-23 16:50:45 -05:00
tracing/mm: Move include of trace/events/kmem.h out of header into slab.c
2012-01-09 14:19:33 -08:00
net: phy: smsc: Move SMSC PHY constants to <linux/smscphy.h>
2012-01-03 20:23:18 -05:00
tcp: detect loss above high_seq in recovery
2012-01-22 15:08:44 -05:00
sock_diag: Introduce the meminfo nla core (v2)
2011-12-30 16:42:19 -05:00
PM / Hibernate: Rewrite unlock_system_sleep() to fix s2disk regression
2012-01-19 23:25:33 +01:00
SHM_UNLOCK: fix Unevictable pages stranded after swap
2012-01-23 08:38:48 -08:00
sys_poll: fix incorrect type for 'timeout' parameter
2012-02-21 17:24:20 -08:00
sysctl: use umode_t for table permissions
2012-01-03 22:55:12 -05:00
switch sysfs_chmod_file() to umode_t
2012-01-03 22:54:56 -05:00
tcp: Replace constants with #define macros
2011-12-21 01:03:23 -05:00
thermal: Rename generate_netlink_event
2012-01-23 03:15:25 -05:00
tty: remove unused tty_driver->termios_locked
2012-01-17 10:30:38 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-01-08 13:21:22 -08:00
Input: ucb1400_ts - convert to threaded IRQ
2012-01-04 22:19:55 -08:00
unix_diag: Fixup RQLEN extension report
2011-12-30 16:46:02 -05:00
kernel-doc: fix new warning in usb.h
2012-01-24 12:25:14 -08:00
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
2012-01-15 12:49:56 -08:00
virtio: pci: add PM notification handlers for restore, freeze, thaw, poweroff
2012-01-12 15:44:44 +10:30
virtio: harsher barriers for rpmsg.
2012-01-12 15:44:42 +10:30
lockdep/waitqueues: Add better annotation
2011-12-21 10:07:39 +01:00
watchdog: add nowayout helpers to Watchdog Timer Driver Kernel API
2012-01-06 15:22:04 +01:00
workqueue: make alloc_workqueue() take printf fmt and args for name
2012-01-10 16:30:54 -08:00
Merge branch 'writeback-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux
2012-01-10 16:59:59 -08:00
