Linus Torvalds
ed378a52da
USB merge for 3.4-rc1 ...
Here's the big USB merge for the 3.4-rc1 merge window.
Lots of gadget driver reworks here, driver updates, xhci changes, some
new drivers added, usb-serial core reworking to fix some bugs, and other
various minor things.
There are some patches touching arch code, but they have all been acked
by the various arch maintainers.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (GNU/Linux)
iEYEABECAAYFAk9njL8ACgkQMUfUDdst+ylQ9wCfbBOnIT01lGOorkaE9pom0hhk
HfMAoKq1xzCR2B+OS3UMyUQffk+Ri9Ri
=KIQ2
-----END PGP SIGNATURE-----
Merge tag 'usb-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
Pull USB merge for 3.4-rc1 from Greg KH:
"Here's the big USB merge for the 3.4-rc1 merge window.
Lots of gadget driver reworks here, driver updates, xhci changes, some
new drivers added, usb-serial core reworking to fix some bugs, and
other various minor things.
There are some patches touching arch code, but they have all been
acked by the various arch maintainers."
* tag 'usb-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (302 commits)
net: qmi_wwan: add support for ZTE MF820D
USB: option: add ZTE MF820D
usb: gadget: f_fs: Remove lock is held before freeing checks
USB: option: make interface blacklist work again
usb/ub: deprecate & schedule for removal the "Low Performance USB Block" driver
USB: ohci-pxa27x: add clk_prepare/clk_unprepare calls
USB: use generic platform driver on ath79
USB: EHCI: Add a generic platform device driver
USB: OHCI: Add a generic platform device driver
USB: ftdi_sio: new PID: LUMEL PD12
USB: ftdi_sio: add support for FT-X series devices
USB: serial: mos7840: Fixed MCS7820 device attach problem
usb: Don't make USB_ARCH_HAS_{XHCI,OHCI,EHCI} depend on USB_SUPPORT.
usb gadget: fix a section mismatch when compiling g_ffs with CONFIG_USB_FUNCTIONFS_ETH
USB: ohci-nxp: Remove i2c_write(), use smbus
USB: ohci-nxp: Support for LPC32xx
USB: ohci-nxp: Rename symbols from pnx4008 to nxp
USB: OHCI-HCD: Rename ohci-pnx4008 to ohci-nxp
usb: gadget: Kconfig: fix typo for 'different'
usb: dwc3: pci: fix another failure path in dwc3_pci_probe()
...
2012-03-20 11:26:30 -07:00
ARM: 7339/1: amba/serial.h: Include types.h for resolving dependency of type bool
2012-02-23 22:07:55 +00: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
USB merge for 3.4-rc1
2012-03-20 11:26:30 -07: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
Merge branch 'for-3.3' of git://linux-nfs.org/~bfields/linux
2012-01-14 12:26:41 -08:00
USB: EHCI: Add a generic platform device driver
2012-03-15 12:42:07 -07: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
tty: serial: altera_uart: remove early_altera_uart_setup
2012-02-09 09:04:23 -08: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
clocksource: Get rid of clocksource_calc_mult_shift()
2012-02-01 18:37:39 -08: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
drivers: hv: kvp: Add/cleanup connector defines
2012-02-02 15:30:47 -08:00
module_param: make bool parameters really bool (drivers & misc)
2012-01-13 09:32:20 +10:30
CPU: Introduce ARCH_HAS_CPU_AUTOPROBE and X86 parts
2012-01-26 16:49:08 -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
vfs: move dentry_cmp from <linux/dcache.h> to fs/dcache.c
2012-03-04 15:51:42 -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
USB merge for 3.4-rc1
2012-03-20 11:26:30 -07: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
dynamic_debug: reduce lineno field to a saner 18 bits
2012-01-24 12:48:54 -08:00
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
drivercore: Add driver probe deferral mechanism
2012-03-08 11:53:13 -08: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
ftrace, perf: Add filter support for function trace event
2012-02-21 11:08:30 -05:00
ftrace: Allow to specify filter field type for ftrace events
2012-02-21 11:08:29 -05:00
block: Fix NULL pointer dereference in sd_revalidate_disk
2012-03-02 10:38:33 +01: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
Tools: hv: Support enumeration from all the pools
2012-03-16 13:36:04 -07: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
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
sched: Make initial SCHED_RR timeslace DEF_TIMESLICE
2012-02-22 12:28:29 +01:00
tracing/softirq: Move __raise_softirq_irqoff() out of header
2012-02-03 09:48:19 -05:00
block: exit_io_context() should call elevator_exit_icq_fn()
2012-02-15 09:45:53 +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
static keys: Inline the static_key_enabled() function
2012-02-28 20:01:08 +01:00
vt:tackle kbd_table
2012-03-08 10:50:35 -08:00
unix_diag: Include unix_diag.h into header-y target
2011-12-30 16:42:19 -05:00
sched/x86: Fix overflow in cyc2ns_offset
2012-03-13 16:27:51 +01: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
vt:tackle kbd_table
2012-03-08 10:50:35 -08:00
kmsg_dump: don't run on non-error paths by default
2012-03-05 15:49:42 -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
math: Introduce div64_long
2012-03-15 21:41:34 +01:00
ARM: Orion: Get address map from plat-orion instead of via platform_data
2011-12-13 18:46:55 -05:00
memcg: fix GPF when cgroup removal races with last exit
2012-03-05 15:49:43 -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
Merge 3.3-rc2 into the driver-core-next branch.
2012-02-02 11:24:44 -08: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
driver core merge for 3.4-rc1
2012-03-20 11:16:20 -07:00
static keys: Introduce 'struct static_key', static_key_true()/false() and static_key_slow_[inc|dec]()
2012-02-24 10:05:59 +01: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
dt: add empty of_find_compatible_node function
2012-02-15 13:10:15 -07: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: Add helper macro for pci_register_driver boilerplate
2012-02-09 08:36:05 -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: fix __this_cpu_{sub,inc,dec}_return() definition
2012-03-04 09:34:15 -08:00
perf: Add ABI reference sizes
2012-03-09 08:26:05 +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
sched/rt: Document scheduler related skip-resched-check sites
2012-03-01 10:28:04 +01:00
driver core merge for 3.4-rc1
2012-03-20 11:16:20 -07: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
rcu: Add RCU_NONIDLE() for idle-loop RCU read-side critical sections
2012-02-21 09:06:13 -08:00
rcu: Prevent RCU callbacks from executing before scheduler initialized
2012-02-21 09:03:41 -08:00
rcu: Call out dangers of expedited RCU primitives
2012-02-21 09:06:08 -08:00
regset: Return -EFAULT, not -EIO, on host-side memory fault
2012-03-02 11:38:15 -08: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
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-03-20 10:31:44 -07: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
TTY: serial, simplify ASYNC_USR_MASK
2012-03-08 11:38:50 -08:00
serial: introduce generic port in/out helpers
2012-03-09 12:47:56 -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
rcu: Convert WARN_ON_ONCE() in rcu_lock_acquire() to lockdep
2012-02-21 09:06:09 -08:00
static keys: Introduce 'struct static_key', static_key_true()/false() and static_key_slow_[inc|dec]()
2012-02-24 10:05:59 +01:00
tty: sparc: rename drivers/tty/serial/suncore.h -> include/linux/sunserialcore.h
2012-02-10 10:44:35 -08: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
drivers/base: add bus for System-on-Chip devices
2012-02-10 11:42:25 -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: fix comment for tp->highest_sack
2012-02-28 15:06:33 -05:00
thermal: Rename generate_netlink_event
2012-01-23 03:15:25 -05:00
ntp: Access tick_length variable via ntp_tick_length()
2012-01-26 19:44:23 -08:00
static keys: Introduce 'struct static_key', static_key_true()/false() and static_key_slow_[inc|dec]()
2012-02-24 10:05:59 +01:00
TTY: provide tty_standard_install helper
2012-02-02 14:55:45 -08:00
TTY: tty_driver, document tty->ops->shutdown limitation
2012-03-08 11:38:51 -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
USB: dynamically allocate usb_device children pointers instead of using a fix array
2012-03-13 14:24:07 -07: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
vt:tackle kbd_table
2012-03-08 10:50:35 -08:00
sched/wait: Add __wake_up_all_locked() API
2012-03-01 10:28:04 +01:00
watchdog: add nowayout helpers to Watchdog Timer Driver Kernel API
2012-01-06 15:22:04 +01:00
Block: use a freezable workqueue for disk-event polling
2012-03-02 10:51:00 +01: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
